From 9abdf580d910e13ade68cbb23da9b5d83b839f8d Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 26 Oct 2006 01:33:36 +0000
Subject: use lock to remove race conditions in bringing up ppp and dhcp that
 would lead to multiple active processes

SVN-Revision: 5298
---
 package/base-files/default/sbin/ifdown | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'package/base-files/default/sbin/ifdown')

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
-- 
cgit v1.2.3