From 6628b238eba06815a19c51a2f7a700a5c83032ae Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 24 Oct 2006 23:59:08 +0000 Subject: 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 --- package/base-files/default/lib/network/config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/base-files/default/lib/network/config.sh') diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh index a66c92bc0..25c7278e9 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 -- cgit v1.2.3