summaryrefslogtreecommitdiffstats
path: root/package/base-files/default/sbin/ifdown
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-26 01:33:36 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-26 01:33:36 +0000
commit0d67238dc68a0d410c484064e2eccb1808df94ac (patch)
treeb26a16748dffb5ff899a9e14eb1de3f00b938cf1 /package/base-files/default/sbin/ifdown
parent81ddc1b91ccffce0d0be47c55f9b50115f5a6869 (diff)
use lock to remove race conditions in bringing up ppp and dhcp that would lead to multiple active processes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5298 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/default/sbin/ifdown')
-rwxr-xr-xpackage/base-files/default/sbin/ifdown14
1 files changed, 12 insertions, 2 deletions
diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown
index 37d0918e8..50d59d1df 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