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/ppp | |
| parent | 3d497ab62c19ed66b3b69ba7b01d8f7d095c3f83 (diff) | |
| download | upstream-9abdf580d910e13ade68cbb23da9b5d83b839f8d.tar.gz upstream-9abdf580d910e13ade68cbb23da9b5d83b839f8d.tar.bz2 upstream-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/ppp')
| -rw-r--r-- | package/ppp/files/ppp.sh | 10 |
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}" } |