aboutsummaryrefslogtreecommitdiffstats
path: root/package/ppp/files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-26 01:33:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-26 01:33:36 +0000
commitd60a55ea0ea3d8697ca799a7629458ee1214679f (patch)
treeb26a16748dffb5ff899a9e14eb1de3f00b938cf1 /package/ppp/files
parenta277034a7d00fb11504e26c8cbfcb019be72e6a3 (diff)
downloadupstream-d60a55ea0ea3d8697ca799a7629458ee1214679f.tar.gz
upstream-d60a55ea0ea3d8697ca799a7629458ee1214679f.tar.bz2
upstream-d60a55ea0ea3d8697ca799a7629458ee1214679f.zip
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/ppp/files')
-rw-r--r--package/ppp/files/ppp.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 133400509c..35572a0a0d 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -7,10 +7,14 @@ scan_ppp() {
start_pppd() {
local cfg="$1"; shift
-
+
# make sure only one pppd process is started
+ lock "/var/lock/ppp-${cfg}"
local pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)"
- [ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && return 0
+ [ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
+ lock -u "/var/lock/ppp-${cfg}"
+ return 0
+ }
config_get device "$cfg" device
config_get unit "$cfg" unit
@@ -31,4 +35,6 @@ start_pppd() {
${username:+user "$username" password "$password"} \
linkname "$cfg" \
ipparam "$cfg"
+
+ lock -u "/var/lock/ppp-${cfg}"
}