Attachment 380545 Details for Bug 625770

[patch] Possible patch renaming the option 121 to rfc3442-classless-static-routes

rfc3442-classless-static-routes-option-rename.diff (text/plain), 3.01 KB, created by Marius Tomaschewski on 2010-08-04 12:43:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2010-08-04 12:43:54 UTC

Size: 3.01 KB

patch

obsolete

>Index: dhclient-script
>===================================================================
>--- dhclient-script	(revision f1d78b990965cd41c6377ad6f27c444c) 
>+++ dhclient-script	(working copy) 
>@@ -78,7 +78,7 @@
>           (new_network_number)        k='NETWORK'             ;;
>           (new_broadcast_address)     k='BROADCAST'           ;;
>           (new_interface_mtu)         k='MTU'                 ;;
>-          (new_rfc3442_classless_static_routes)
>+          (new_rfc3442_classless_static_routes_formatted)
>                                       k='ROUTES'              ;;
>         # (new_static_routes)         k='ROUTES'              ;;
>           (new_routers)               k='GATEWAYS'            ;;
>@@ -195,9 +195,9 @@
> }
> get_ipv4_default_gw()
> {
>-  if [ "x$new_rfc3442_classless_static_routes" != x ] ; then
>+  if [ "x$new_rfc3442_classless_static_routes_formatted" != x ] ; then
>     local r route=() gw=()
>-    for r in $new_rfc3442_classless_static_routes ; do
>+    for r in $new_rfc3442_classless_static_routes_formatted ; do
>       route=(${r//,/ })
>       case ${route[0]}/${route[1]} in
>       0.0.0.0/0.0.0.0)
>@@ -213,10 +213,10 @@
> }
> set_ipv4_routes()
> {
>-  if [ "x$new_rfc3442_classless_static_routes" != x ] ; then
>+  if [ "x$new_rfc3442_classless_static_routes_formatted" != x ] ; then
>     local r route=()
>     # TODO: multiple gw's to one dest as in $new_routers?
>-    for r in $new_rfc3442_classless_static_routes ; do
>+    for r in $new_rfc3442_classless_static_routes_formatted ; do
>       route=(${r//,/ })
>       case ${route[0]}/${route[1]} in
>       0.0.0.0/0.0.0.0)
>@@ -323,12 +323,12 @@
>           '^[[:space:]]*DHCLIENT_SET_$HOSTNAME\|DEFAULT_ROUTE$=' \
>           "$SYSCONFIG_CFG_DIR/dhcp" 2>/dev/null`
>   fi
>-  if [ "x$new_rfc3442_classless_static_routes_raw" != x ] ; then
>-    new_rfc3442_classless_static_routes=$(
>-      parse_ipv4_classless_routes $new_rfc3442_classless_static_routes_raw
>+  if [ "x$new_rfc3442_classless_static_routes" != x ] ; then
>+    new_rfc3442_classless_static_routes_formatted=$(
>+      parse_ipv4_classless_routes $new_rfc3442_classless_static_routes
>     )
>   else
>-    unset new_rfc3442_classless_static_routes
>+    unset new_rfc3442_classless_static_routes_formatted
>   fi
>   if [ x$new_broadcast_address != x ] ; then
>     new_broadcast_arg="brd $new_broadcast_address"
>Index: dhclient.conf
>===================================================================
>--- dhclient.conf	(revision f1d78b990965cd41c6377ad6f27c444c) 
>+++ dhclient.conf	(working copy) 
>@@ -30,11 +30,11 @@
> #
> # define classless static route option
> #
>-option rfc3442-classless-static-routes_raw code 121 = array of unsigned integer 8;
>+option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
> 
> # Request several well known/usefull dhcp options.
> request subnet-mask, broadcast-address, routers,
>-	rfc3442-classless-static-routes_raw,
>+	rfc3442-classless-static-routes,
> 	interface-mtu, host-name, domain-name,
> 	domain-name-servers, nis-domain, nis-servers,
> 	nds-context, nds-servers, nds-tree-name,
>

Actions: View | Diff

Attachments on bug 625770: 380545