qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

[package] base-files, ppp: remove protocol specific cleanup code from /sbin/ifdown and move it to protocol stop callbacks

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21383 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow
2010-05-05 23:24:11 +00:00
parent 6c8910d06f
commit d9494637a8
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
package/base-files/files/lib/network/config.sh
View File

@@ -264,7 +264,6 @@ setup_interface() {
}
set_interface_ifname "$config" "$iface_main"
pidfile="/var/run/$iface_main.pid"
[ -n "$proto" ] || config_get proto "$config" proto
case "$proto" in
static)
@@ -272,11 +271,14 @@ setup_interface() {
setup_interface_static "$iface_main" "$config"
;;
dhcp)
local lockfile="/var/lock/dhcp-$iface_main"
lock "$lockfile"
# prevent udhcpc from starting more than once
lock "/var/lock/dhcp-$iface_main"
local pidfile="/var/run/dhcp-${iface_main}.pid"
local pid="$(cat "$pidfile" 2>/dev/null)"
if [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null; then
lock -u "/var/lock/dhcp-$iface_main"
if [ -d "/proc/$pid" ] && grep -qs udhcpc "/proc/${pid}/cmdline"; then
lock -u "$lockfile"
else
local ipaddr netmask hostname proto1 clientid
config_get ipaddr "$config" ipaddr
@@ -292,7 +294,7 @@ setup_interface() {
local dhcpopts
[ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
$DEBUG eval udhcpc -t 0 -i "$iface_main" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} ${clientid:+-c $clientid} -b -p "$pidfile" ${dhcpopts:- -O rootpath -R &}
lock -u "/var/lock/dhcp-$iface_main"
lock -u "$lockfile"
fi
;;
none)
@@ -329,6 +331,21 @@ setup_interface() {
stop_interface_dhcp() {
local config="$1"
local iface
config_get iface "$config" iface
local lock="/var/lock/dhcp-${iface}"
[ -f "$lock" ] && lock -u "$lock"
local pidfile="/var/run/dhcp-${iface}.pid"
local pid="$(cat "$pidfile" 2>/dev/null)"
[ -d "/proc/$pid" ] && {
grep -qs udhcpc "/proc/$pid/cmdline" && kill -TERM $pid && \
while grep -qs udhcpc "/proc/$pid/cmdline"; do sleep 1; done
rm -f "$pidfile"
}
uci -P /var/state revert "network.$config"
}