diff options
author | Felix Fietkau <nbd@openwrt.org> | 2006-10-26 01:33:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-26 01:33:36 +0000 |
commit | 9abdf580d910e13ade68cbb23da9b5d83b839f8d (patch) | |
tree | 382be136f0a8f3b8b8d4bd9fd78555d78bf17cc4 /package/base-files/default/sbin/ifdown | |
parent | 3d497ab62c19ed66b3b69ba7b01d8f7d095c3f83 (diff) | |
download | master-31e0f0ae-9abdf580d910e13ade68cbb23da9b5d83b839f8d.tar.gz master-31e0f0ae-9abdf580d910e13ade68cbb23da9b5d83b839f8d.tar.bz2 master-31e0f0ae-9abdf580d910e13ade68cbb23da9b5d83b839f8d.zip |
use lock to remove race conditions in bringing up ppp and dhcp that would lead to multiple active processes
SVN-Revision: 5298
Diffstat (limited to 'package/base-files/default/sbin/ifdown')
-rwxr-xr-x | package/base-files/default/sbin/ifdown | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 37d0918e85..50d59d1df8 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -12,14 +12,24 @@ debug "### ifdown $cfg ###" config_get proto "$cfg" proto [ -z "$proto" ] && { echo "interface not found."; exit; } +# make sure all locks are removed +for lock in "/var/lock/dhcp-$iface" "/var/lock/ppp-$iface"; do + [ -f "$lock" ] && { + lock -u "$lock" + sleep 1 + } +done + # kill active ppp daemon and other processes config_get ifname "$cfg" ifname pids="$(cat /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid 2>/dev/null)" for pid in $pids; do [ -d "/proc/$pid" ] && { kill $pid - sleep 1 - [ -d "/proc/$pid" ] && kill -9 $pid + [ -d "/proc/$pid" ] && { + sleep 1 + kill -9 $pid 2>/dev/null >/dev/null + } } done rm -f /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid |