diff options
| author | thompsa <thompsa@FreeBSD.org> | 2007-07-03 17:49:32 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2007-07-03 17:49:32 +0000 |
| commit | a5a2c7551bc228c50a49d223e031e75a2a1dff2b (patch) | |
| tree | d5a12acafc69b14d2dd5b219e9e4457ccb35dd0e /sbin | |
| parent | 764028016fb7c8690eca612fc2105107e23ed996 (diff) | |
| download | FreeBSD-src-a5a2c7551bc228c50a49d223e031e75a2a1dff2b.zip FreeBSD-src-a5a2c7551bc228c50a49d223e031e75a2a1dff2b.tar.gz | |
Use the -n flag on ifconfig so that dhclient does not cause the kernel module
to be reloaded when the interface is torn down.
Reviewed by: brooks
Approved by: re (kensmith)
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhclient/dhclient-script | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sbin/dhclient/dhclient-script b/sbin/dhclient/dhclient-script index 4284aaf..c6c9e8c 100644 --- a/sbin/dhclient/dhclient-script +++ b/sbin/dhclient/dhclient-script @@ -22,6 +22,7 @@ ARP=/usr/sbin/arp AWK=/usr/bin/awk HOSTNAME=/bin/hostname +IFCONFIG='/sbin/ifconfig -n' NETSTAT=/usr/bin/netstat LOCALHOST=127.0.0.1 @@ -55,11 +56,11 @@ arp_flush() { } delete_old_address() { - eval "ifconfig $interface inet -alias $old_ip_address $medium" + eval "$IFCONFIG $interface inet -alias $old_ip_address $medium" } add_new_address() { - eval "ifconfig $interface \ + eval "$IFCONFIG $interface \ inet $new_ip_address \ netmask $new_subnet_mask \ broadcast $new_broadcast_address \ @@ -73,14 +74,14 @@ add_new_address() { delete_old_alias() { if [ -n "$alias_ip_address" ]; then - ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1 + $IFCONFIG $interface inet -alias $alias_ip_address > /dev/null 2>&1 #route delete $alias_ip_address $LOCALHOST > /dev/null 2>&1 fi } add_new_alias() { if [ -n "$alias_ip_address" ]; then - ifconfig $interface inet alias $alias_ip_address netmask \ + $IFCONFIG $interface inet alias $alias_ip_address netmask \ $alias_subnet_mask #route add $alias_ip_address $LOCALHOST fi @@ -276,14 +277,14 @@ fi case $reason in MEDIUM) - eval "ifconfig $interface $medium" - eval "ifconfig $interface inet -alias 0.0.0.0 $medium" >/dev/null 2>&1 + eval "$IFCONFIG $interface $medium" + eval "$IFCONFIG $interface inet -alias 0.0.0.0 $medium" >/dev/null 2>&1 sleep 1 ;; PREINIT) delete_old_alias - ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 broadcast 255.255.255.255 up + $IFCONFIG $interface inet 0.0.0.0 netmask 0.0.0.0 broadcast 255.255.255.255 up ;; ARPCHECK|ARPSEND) @@ -346,7 +347,7 @@ TIMEOUT) fi fi fi - eval "ifconfig $interface inet -alias $new_ip_address $medium" + eval "$IFCONFIG $interface inet -alias $new_ip_address $medium" delete_old_routes exit_with_hooks 1 ;; |
