projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make network scripts more robust, prevent multiple instances of pppd and udhcpc for...
[openwrt-10.03/.git]
/
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 a66c92bc033198a011debb05d382d6d23f03ca81..25c7278e99239c7d9f32e998d2fc7d3aeb47b055 100755
(executable)
--- 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)
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)"
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
config_get ipaddr "$config" ipaddr
config_get netmask "$config" netmask