summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-19 15:13:06 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-19 15:13:06 +0000
commit0f55e30c2e313d6c3152c7a1d2f82183fd5c5d68 (patch)
tree3086c5f7d5f34aa86abf9377e92f24fee2c982c9
parent835a68409cb230cccd703fe8e5ffcba3a1096c8e (diff)
[package] base-files: kill possibly existing udhcpc instance when bringing up a dhcp iface, utilize service_kill() in dhcp shutdown.
Based on patch by Stijn Tintel. Possibly related to #7314 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23092 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh65
1 files changed, 26 insertions, 39 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index a5bc9ac6f..c948c83a8 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -340,40 +340,32 @@ setup_interface() {
setup_interface_static "$iface" "$config"
;;
dhcp)
- local lockfile="/var/lock/dhcp-$iface"
- lock "$lockfile"
-
- # prevent udhcpc from starting more than once
+ # kill running udhcpc instance
local pidfile="/var/run/dhcp-${iface}.pid"
- local pid="$(cat "$pidfile" 2>/dev/null)"
- if [ -d "/proc/$pid" ] && grep -qs udhcpc "/proc/${pid}/cmdline"; then
- lock -u "$lockfile"
- else
- local ipaddr netmask hostname proto1 clientid broadcast
- config_get ipaddr "$config" ipaddr
- config_get netmask "$config" netmask
- config_get hostname "$config" hostname
- config_get proto1 "$config" proto
- config_get clientid "$config" clientid
- config_get_bool broadcast "$config" broadcast 0
-
- [ -z "$ipaddr" ] || \
- $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
-
- # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
- local dhcpopts
- [ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
- [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
-
- $DEBUG eval udhcpc -t 0 -i "$iface" \
- ${ipaddr:+-r $ipaddr} \
- ${hostname:+-H $hostname} \
- ${clientid:+-c $clientid} \
- -b -p "$pidfile" $broadcast \
- ${dhcpopts:- -O rootpath -R &}
-
- lock -u "$lockfile"
- fi
+ service_kill udhcpc "$pidfile"
+
+ local ipaddr netmask hostname proto1 clientid broadcast
+ config_get ipaddr "$config" ipaddr
+ config_get netmask "$config" netmask
+ config_get hostname "$config" hostname
+ config_get proto1 "$config" proto
+ config_get clientid "$config" clientid
+ config_get_bool broadcast "$config" broadcast 0
+
+ [ -z "$ipaddr" ] || \
+ $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
+
+ # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
+ local dhcpopts
+ [ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
+ [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
+
+ $DEBUG eval udhcpc -t 0 -i "$iface" \
+ ${ipaddr:+-r $ipaddr} \
+ ${hostname:+-H $hostname} \
+ ${clientid:+-c $clientid} \
+ -b -p "$pidfile" $broadcast \
+ ${dhcpopts:- -O rootpath -R &}
;;
none)
setup_interface_none "$iface" "$config"
@@ -401,12 +393,7 @@ stop_interface_dhcp() {
remove_dns "$config"
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 && \
- while grep -qs udhcpc "/proc/$pid/cmdline"; do sleep 1; done
- rm -f "$pidfile"
- }
+ service_kill udhcpc "$pidfile"
uci -P /var/state revert "network.$config"
}