diff --git a/sbin/dhclient-script b/linux index f779437..14655f0 100755 --- a/sbin/dhclient-script +++ b/linux @@ -23,7 +23,7 @@ # of the $1 in its args. # 'ip' just looks too weird. /sbin/ip looks less weird. -ip=/usr/sbin/ip +ip=/sbin/ip make_resolv_conf() { if [ x"$new_domain_name_servers" != x ]; then @@ -122,9 +122,9 @@ fi if [ x$reason = xPREINIT ]; then if [ x$alias_ip_address != x ]; then # Bring down alias interface. Its routes will disappear too. - /sbin/ifconfig $interface:0- inet 0 + ifconfig $interface:0- inet 0 fi - /sbin/ifconfig $interface 0 up + ifconfig $interface 0 up # We need to give the kernel some time to get the interface up. sleep 1 @@ -151,25 +151,25 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ 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. - /sbin/ifconfig $interface:0- inet 0 + ifconfig $interface:0- inet 0 fi if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then # IP address changed. Bringing down the interface will delete all routes, # and clear the ARP cache. - /sbin/ifconfig $interface inet 0 down + ifconfig $interface inet 0 down fi if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \ + ifconfig $interface inet $new_ip_address $new_subnet_arg \ $new_broadcast_arg $mtu_arg # Add a network route to the computed network address. for router in $new_routers; do if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then - /sbin/route add -host $router dev $interface + route add -host $router dev $interface fi - /sbin/route add default gw $router $metric_arg dev $interface + 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$reason = xBOUND ] || [ x$reason = xRENEW ] || \ 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 - /sbin/route del default gw $router + route del default gw $router done for router in $new_routers; do if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then - /sbin/route add -host $router dev $interface + route add -host $router dev $interface fi - /sbin/route add default gw $router $metric_arg dev $interface + 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 - /sbin/ifconfig $interface:0- inet 0 - /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - /sbin/route add -host $alias_ip_address $interface:0 + ifconfig $interface:0- inet 0 + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg + route add -host $alias_ip_address $interface:0 fi make_resolv_conf exit_with_hooks 0 @@ -201,42 +201,42 @@ if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ || [ x$reason = xSTOP ]; then if [ x$alias_ip_address != x ]; then # Turn off alias interface. - /sbin/ifconfig $interface:0- inet 0 + ifconfig $interface:0- inet 0 fi if [ x$old_ip_address != x ]; then # Shut down interface, which will delete routes and clear arp cache. - /sbin/ifconfig $interface inet 0 down + ifconfig $interface inet 0 down fi if [ x$alias_ip_address != x ]; then - /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - /sbin/route add -host $alias_ip_address $interface:0 + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg + route add -host $alias_ip_address $interface:0 fi exit_with_hooks 0 fi if [ x$reason = xTIMEOUT ]; then if [ x$alias_ip_address != x ]; then - /sbin/ifconfig $interface:0- inet 0 + ifconfig $interface:0- inet 0 fi - /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \ + ifconfig $interface inet $new_ip_address $new_subnet_arg \ $new_broadcast_arg $mtu_arg set $new_routers if ping -q -c 1 $1; then if [ x$new_ip_address != x$alias_ip_address ] && \ [ x$alias_ip_address != x ]; then - /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - /sbin/route add -host $alias_ip_address dev $interface:0 + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg + route add -host $alias_ip_address dev $interface:0 fi for router in $new_routers; do if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then - /sbin/route add -host $router dev $interface + route add -host $router dev $interface fi - /sbin/route add default gw $router $metric_arg dev $interface + route add default gw $router $metric_arg dev $interface done make_resolv_conf exit_with_hooks 0 fi - /sbin/ifconfig $interface inet 0 down + ifconfig $interface inet 0 down exit_with_hooks 1 fi