move S50dnsmasq into the dnsmasq package

SVN-Revision: 1474

diff --git a/openwrt/package/dnsmasq/Makefile b/openwrt/package/dnsmasq/Makefile
index 5d7133fd1e920d1b4be1302680818505df86a3ad..ddc27c647265f91c3fb3753366de01b02c84b768 100644 (file)
--- a/openwrt/package/dnsmasq/Makefile
+++ b/openwrt/package/dnsmasq/Makefile
@@ -26,8 +26,10 @@ $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(IPKG_DNSMASQ):
-       mkdir -p $(IDIR_DNSMASQ)/usr/sbin
+       install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin
        cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/
        $(STRIP) $(IDIR_DNSMASQ)/usr/sbin/*
+       install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d
+       install -m0755 ./files/S50dnsmasq $(IDIR_DNSMASQ)/etc/init.d
        $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR)
 

diff --git a/openwrt/package/dnsmasq/files/S50dnsmasq b/openwrt/package/dnsmasq/files/S50dnsmasq
new file mode 100755 (executable)
index 0000000..4f37218
--- /dev/null
+++ b/openwrt/package/dnsmasq/files/S50dnsmasq
@@ -0,0 +1,25 @@
+#!/bin/sh
+. /etc/functions.sh
+
+# interface to use for DHCP
+iface=lan
+
+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 /bin/true -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}

diff --git a/openwrt/target/default/target_skeleton/etc/init.d/S50dnsmasq b/openwrt/target/default/target_skeleton/etc/init.d/S50dnsmasq
deleted file mode 100755 (executable)
index 82e013f..0000000
--- a/openwrt/target/default/target_skeleton/etc/init.d/S50dnsmasq
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-. /etc/functions.sh
-
-# interface to use for DHCP
-iface=lan
-
-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 >&- || {
-
-  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}