diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-11-18 23:19:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-11-18 23:19:32 +0000 |
| commit | 1d7168260e7e05757cffd9f60f5d2c84a49f90f9 (patch) | |
| tree | 28a021e37b54cad024f761572952ee5d6f554d23 | |
| parent | 6dc106401cc2025db2d39e95082105457b968536 (diff) | |
| download | master-187ad058-1d7168260e7e05757cffd9f60f5d2c84a49f90f9.tar.gz master-187ad058-1d7168260e7e05757cffd9f60f5d2c84a49f90f9.tar.bz2 master-187ad058-1d7168260e7e05757cffd9f60f5d2c84a49f90f9.zip | |
hopefully fix duplicate ppp instances (#895)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5577 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/default/sbin/ifdown | 2 | ||||
| -rw-r--r-- | package/ppp/files/ppp.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 2b7f7b632b..26d0e626d2 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -30,7 +30,7 @@ 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)" +pids="$(head -n1 -q /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid 2>/dev/null)" for pid in $pids; do [ -d "/proc/$pid" ] && { kill $pid diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 35572a0a0d..abc022741a 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -10,7 +10,7 @@ start_pppd() { # make sure only one pppd process is started lock "/var/lock/ppp-${cfg}" - local pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)" + local pid="$(head -n1 /var/run/ppp-${cfg}.pid 2>/dev/null)" [ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && { lock -u "/var/lock/ppp-${cfg}" return 0 |