From b87d371da44813815e53a44548b5da545314afd8 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 1 Jun 2005 18:28:51 +0000 Subject: make dnsmasq init script non-blocking git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1130 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../default/target_skeleton/etc/init.d/S50dnsmasq | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/target/default/target_skeleton/etc/init.d/S50dnsmasq b/target/default/target_skeleton/etc/init.d/S50dnsmasq index 82e013f72..6a5af0f05 100755 --- a/target/default/target_skeleton/etc/init.d/S50dnsmasq +++ b/target/default/target_skeleton/etc/init.d/S50dnsmasq @@ -8,18 +8,20 @@ ifname=$(nvram get ${iface}_ifname) ipaddr=$(nvram get ${iface}_ipaddr) netmask=$(nvram get ${iface}_netmask) -# check for existing DHCP server -udhcpc -n -q -R -s /dev/zero -i $ifname >&- || { +( + # check for existing DHCP server + udhcpc -n -q -R -s /dev/zero -i $ifname >&- || { - ipaddr=$(ip2int $ipaddr) - netmask=$(ip2int ${netmask:-255.255.255.0}) - network=$((ipaddr&netmask)) - - start=$(nvram get dhcp_start) - start=$((network+${start:-100})) - end=$(nvram get dhcp_num) - end=$((start+${end:-150})) - - args="-l /tmp/dhcp.leases -K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h" -} -dnsmasq ${args} + ipaddr=$(ip2int $ipaddr) + netmask=$(ip2int ${netmask:-255.255.255.0}) + network=$((ipaddr&netmask)) + + start=$(nvram get dhcp_start) + start=$((network+${start:-100})) + end=$(nvram get dhcp_num) + end=$((start+${end:-150})) + + args="-l /tmp/dhcp.leases -K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h" + } + dnsmasq ${args} +) & -- cgit v1.2.3