summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-06 01:14:24 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-06 01:14:24 +0000
commit19b6acd0905aef3f8718e694c0264ef5ddcf6403 (patch)
treedb83ccef3dab90be4a53568b6a89839b76d283cc
parentd9494637a8729f3ec6c4f940c190d8864acd4ebb (diff)
[package] base-files, ppp: fix interface shutdown
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21386 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh6
-rw-r--r--package/ppp/files/ppp.sh9
2 files changed, 7 insertions, 8 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 80547b76d..4336244f6 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -333,12 +333,12 @@ stop_interface_dhcp() {
local config="$1"
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"
- local pidfile="/var/run/dhcp-${iface}.pid"
+ local pidfile="/var/run/dhcp-${ifname}.pid"
local pid="$(cat "$pidfile" 2>/dev/null)"
[ -d "/proc/$pid" ] && {
grep -qs udhcpc "/proc/$pid/cmdline" && kill -TERM $pid && \
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index b3c9e5365..f4417bb67 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -7,15 +7,14 @@ stop_interface_ppp() {
local ifname
config_get ifname "$cfg" ifname
- local link="${proto:-ppp}-$ifname"
- [ -f "/var/run/ppp-${link}.pid" ] && {
- local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
+ [ -f "/var/run/ppp-${ifname}.pid" ] && {
+ local pid="$(head -n1 /var/run/ppp-${ifname}.pid 2>/dev/null)"
grep -qs pppd "/proc/$pid/cmdline" && kill -TERM $pid && \
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"
}