Просмотр исходного кода

hopefully fix duplicate ppp instances (#895)

SVN-Revision: 5577
Felix Fietkau 19 лет назад
Родитель
Сommit
b1d1701fd6
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      package/base-files/default/sbin/ifdown
  2. 1 1
      package/ppp/files/ppp.sh

+ 1 - 1
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

+ 1 - 1
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