diff options
Diffstat (limited to 'extra/dhcp/dhclient-script-pathFixes.patch')
-rw-r--r-- | extra/dhcp/dhclient-script-pathFixes.patch | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/extra/dhcp/dhclient-script-pathFixes.patch b/extra/dhcp/dhclient-script-pathFixes.patch index e19c328d2..a4143ddde 100644 --- a/extra/dhcp/dhclient-script-pathFixes.patch +++ b/extra/dhcp/dhclient-script-pathFixes.patch @@ -1,5 +1,5 @@ ---- linux 2009-04-21 16:21:09.000000000 +0200 -+++ linux_new 2010-06-30 19:06:20.000000000 +0200 +--- linux 2011-05-18 20:01:54.000000000 +0000 ++++ linux_new 2011-12-21 18:45:41.487171012 +0000 @@ -23,7 +23,7 @@ # of the $1 in its args. @@ -9,7 +9,7 @@ make_resolv_conf() { if [ x"$new_domain_name_servers" != x ]; then -@@ -112,9 +112,9 @@ +@@ -122,9 +122,9 @@ if [ x$reason = xPREINIT ]; then if [ x$alias_ip_address != x ]; then # Bring down alias interface. Its routes will disappear too. @@ -21,7 +21,7 @@ # We need to give the kernel some time to get the interface up. sleep 1 -@@ -141,32 +141,32 @@ +@@ -151,25 +151,25 @@ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ [ x$alias_ip_address != x$old_ip_address ]; then # Possible new alias. Remove old alias. @@ -50,6 +50,24 @@ - route add default gw $router $metric_arg dev $interface + /sbin/route add default gw $router $metric_arg dev $interface done + else + # we haven't changed the address, have we changed other options +@@ -177,21 +177,21 @@ + if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then + # if we've changed routers delete the old and add the new. + for router in $old_routers; do +- route del default gw $router ++ /sbin/route del default gw $router + done + for router in $new_routers; do + if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface ++ /sbin/route add -host $router dev $interface + fi +- route add default gw $router $metric_arg dev $interface ++ /sbin/route add default gw $router $metric_arg dev $interface + done + fi fi if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; then @@ -62,7 +80,7 @@ fi make_resolv_conf exit_with_hooks 0 -@@ -176,42 +176,42 @@ +@@ -201,42 +201,42 @@ || [ x$reason = xSTOP ]; then if [ x$alias_ip_address != x ]; then # Turn off alias interface. |