summaryrefslogtreecommitdiff
path: root/package/base-files/default/lib
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-24 23:59:08 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-24 23:59:08 +0000
commit6628b238eba06815a19c51a2f7a700a5c83032ae (patch)
treeaf1827b34df373e91cb217e7fb8d6f78e87a575d /package/base-files/default/lib
parent58c8f8ef5a038b47e39f7b8c9662493f4cde1317 (diff)
make network scripts more robust, prevent multiple instances of pppd and udhcpc for the same interface
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5290 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/default/lib')
-rwxr-xr-xpackage/base-files/default/lib/network/config.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index a66c92bc03..25c7278e99 100755
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -120,8 +120,9 @@ setup_interface() {
env -i ACTION="ifup" INTERFACE="config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" &
;;
dhcp)
+ # prevent udhcpc from starting more than once
pid="$(cat "$pidfile" 2>/dev/null)"
- [ -n "$pid" -a -d "/proc/$pid" ] && kill -9 "$pid"
+ [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null && return 0
config_get ipaddr "$config" ipaddr
config_get netmask "$config" netmask