diff options
| author | Bill Nottingham <notting@redhat.com> | 2002-10-18 20:41:00 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2002-10-18 20:41:00 +0000 |
| commit | d8a4eb6ffbfb1aea46ec15847aebfaa256592305 (patch) | |
| tree | 84d2525a1a94dc3cab17817747bcb1f975e13643 | |
| parent | dd7dbeac1a8f7ef3f9c6bed34c8b8b5870324c4c (diff) | |
| download | initscripts-d8a4eb6ffbfb1aea46ec15847aebfaa256592305.tar initscripts-d8a4eb6ffbfb1aea46ec15847aebfaa256592305.tar.gz initscripts-d8a4eb6ffbfb1aea46ec15847aebfaa256592305.tar.bz2 initscripts-d8a4eb6ffbfb1aea46ec15847aebfaa256592305.tar.xz initscripts-d8a4eb6ffbfb1aea46ec15847aebfaa256592305.zip | |
merge loop fix
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 992fd5ae..9bb99efa 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -1,9 +1,10 @@ #!/bin/bash - -. /etc/init.d/functions +PATH=/sbin:/usr/sbin:/bin:/usr/bin +TEXTDOMAIN=initscripts cd /etc/sysconfig/network-scripts . network-functions +. /etc/rc.d/init.d/functions CONFIG=$1 @@ -68,12 +69,6 @@ fi retcode=0 if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then - [ -n "`pidof -x dhclient`" ] && { - if [ -f "/var/run/dhclient-${DEVICE}.pid" ]; then - kill `cat /var/run/dhclient-${DEVICE}.pid` >/dev/null 2>&1 - retcode=$? - fi - } [ -n "`pidof -x dhcpcd`" ] && { if [ -f "/etc/dhcpc/dhcpcd-${DEVICE}.pid" ]; then kill `cat /etc/dhcpc/dhcpcd-${DEVICE}.pid` >/dev/null 2>&1 @@ -88,6 +83,7 @@ if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then retcode=$? } else + expand_config # we can't just delete the configured address because that address # may have been changed in the config file since the device was # brought up. Flush all addresses associated with this |