KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files, ppp: fix interface shutdown

Browse source 
SVN-Revision: 21386
This commit is contained in:
Jo-Philipp Wich 2010-05-06 01:14:24 +00:00
parent 66ab73d01f
commit dd38b15b75
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/base-files/files/lib/network/config.sh
View file

@ -333,12 +333,12 @@ stop_interface_dhcp() {
local config="$1" local config="$1"
local iface local iface
config_get iface "$config" iface config_get ifname "$config" ifname
local lock="/var/lock/dhcp-${iface}" local lock="/var/lock/dhcp-${ifname}"
[ -f "$lock" ] && lock -u "$lock" [ -f "$lock" ] && lock -u "$lock"
local pidfile="/var/run/dhcp-${iface}.pid" local pidfile="/var/run/dhcp-${ifname}.pid"
local pid="$(cat "$pidfile" 2>/dev/null)" local pid="$(cat "$pidfile" 2>/dev/null)"
[ -d "/proc/$pid" ] && { [ -d "/proc/$pid" ] && {
grep -qs udhcpc "/proc/$pid/cmdline" && kill -TERM $pid && \ grep -qs udhcpc "/proc/$pid/cmdline" && kill -TERM $pid && \

9
package/ppp/files/ppp.sh
View file

@ -7,15 +7,14 @@ stop_interface_ppp() {
local ifname local ifname
config_get ifname "$cfg" ifname config_get ifname "$cfg" ifname
local link="${proto:-ppp}-$ifname" [ -f "/var/run/ppp-${ifname}.pid" ] && {
[ -f "/var/run/ppp-${link}.pid" ] && { local pid="$(head -n1 /var/run/ppp-${ifname}.pid 2>/dev/null)"
local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid && \ grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid && \
while grep -qs pppd "/proc/$pid/cmdline"; do sleep 1; done while grep -qs pppd "/proc/$pid/cmdline"; do sleep 1; done
rm -f "/var/run/ppp-${link}.pid" rm -f "/var/run/ppp-${ifname}.pid"
} }
local lock="/var/lock/ppp-$link" local lock="/var/lock/ppp-$ifname"
[ -f "$lock" ] && lock -u "$lock" [ -f "$lock" ] && lock -u "$lock"
} }