diff options
author | Felix Fietkau <nbd@openwrt.org> | 2005-06-01 18:28:51 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2005-06-01 18:28:51 +0000 |
commit | a261060fa82c7c2c7fb74b8662bf3f1742e3608d (patch) | |
tree | 017a2df7f9e515f5dac86bafe5c955fcbbd44433 | |
parent | 3cb2477b84e8157971a6e2df007a90793d79e330 (diff) | |
download | upstream-a261060fa82c7c2c7fb74b8662bf3f1742e3608d.tar.gz upstream-a261060fa82c7c2c7fb74b8662bf3f1742e3608d.tar.bz2 upstream-a261060fa82c7c2c7fb74b8662bf3f1742e3608d.zip |
make dnsmasq init script non-blocking
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1130 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-x | target/default/target_skeleton/etc/init.d/S50dnsmasq | 30 |
1 files 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 82e013f724..6a5af0f05f 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} +) & |