diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-10-26 01:33:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-26 01:33:36 +0000 |
| commit | d60a55ea0ea3d8697ca799a7629458ee1214679f (patch) | |
| tree | b26a16748dffb5ff899a9e14eb1de3f00b938cf1 /package/base-files/default/lib/network/config.sh | |
| parent | a277034a7d00fb11504e26c8cbfcb019be72e6a3 (diff) | |
| download | upstream-d60a55ea0ea3d8697ca799a7629458ee1214679f.tar.gz upstream-d60a55ea0ea3d8697ca799a7629458ee1214679f.tar.bz2 upstream-d60a55ea0ea3d8697ca799a7629458ee1214679f.zip | |
use lock to remove race conditions in bringing up ppp and dhcp that would lead to multiple active processes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5298 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/default/lib/network/config.sh')
| -rwxr-xr-x | package/base-files/default/lib/network/config.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh index 25c7278e99..9c91a7cabf 100755 --- a/package/base-files/default/lib/network/config.sh +++ b/package/base-files/default/lib/network/config.sh @@ -121,8 +121,12 @@ setup_interface() { ;; dhcp) # prevent udhcpc from starting more than once + lock "/var/lock/dhcp-$iface" pid="$(cat "$pidfile" 2>/dev/null)" - [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null && return 0 + [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null && { + lock -u "/var/lock/dhcp-$iface" + return 0 + } config_get ipaddr "$config" ipaddr config_get netmask "$config" netmask @@ -135,6 +139,7 @@ setup_interface() { # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp) [ "$proto1" != "$proto" ] && dhcpopts="-n -q" $DEBUG udhcpc -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &} + lock -u "/var/lock/dhcp-$iface" ;; *) if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then |