use lock to remove race conditions in bringing up ppp and dhcp that would lead to...

[openwrt-10.03/.git] / package / ppp / files / ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 133400509ceba52dffdf5766864964b410df361c..35572a0a0d8ab5ab3a41cf737670d82b13021169 100644 (file)
--- 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}"
 }