rename S50dnsmasq to S60dnsmasq, so that dropbear/telnet gets started earlier

SVN-Revision: 5524

diff --git a/openwrt/package/dnsmasq/Makefile b/openwrt/package/dnsmasq/Makefile
index 7b011e4825ffa23ee0fed1e7d5cf226eba9b308e..3c6c956ec8d36d32a6824395b10d4b5d449acee5 100644 (file)
--- a/openwrt/package/dnsmasq/Makefile
+++ b/openwrt/package/dnsmasq/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.33
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=45696461b6e6bc929273b1191ca50447
 
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
@@ -30,7 +30,7 @@ $(IPKG_DNSMASQ):
        $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/
        install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/
        install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf
-       install -m0755 ./files/S50dnsmasq $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq
+       install -m0755 ./files/S60dnsmasq $(IDIR_DNSMASQ)/etc/init.d/S60dnsmasq
        $(RSTRIP) $(IDIR_DNSMASQ)
        $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR)
 

diff --git a/openwrt/package/dnsmasq/files/S50dnsmasq b/openwrt/package/dnsmasq/files/S50dnsmasq
deleted file mode 100755 (executable)
index 1699659..0000000
--- a/openwrt/package/dnsmasq/files/S50dnsmasq
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# The following is to automatically configure the DHCP settings
-# based on nvram settings. Feel free to replace all this crap
-# with a simple "dnsmasq" and manage everything via the
-# /etc/dnsmasq.conf config file
-
-# DHCP interface (lan, wan, wifi -- any ifup *)
-iface=lan
-ifname=$(nvram get ${iface}_ifname)
-
-udhcpc -n -q -R -s /bin/true -i $ifname >&- || {
-  # no existing DHCP server?
-
-  # calculate settings
-   ipaddr=$(nvram get ${iface}_ipaddr)
-  netmask=$(nvram get ${iface}_netmask)
-    start=$(nvram get dhcp_start)
-      num=$(nvram get dhcp_num)
-
-  eval $(ipcalc $ipaddr $netmask ${start:-100} ${num:-150})
-  lease=$(nvram get dhcp_lease)
-  
-  # and pass the args via the commandline
-  # (because trying to edit the config from here is crazy)
-  args="-K -F $START,$END,$NETMASK,${lease:-12h}"
-}
-
-# ignore requests from wan interface
-wanproto=$(nvram get wan_proto)
-[ -z "$wanproto" -o "$wanproto" = "none" ] || args="${args} -I $(nvram get wan_ifname)"
-
-dnsmasq ${args} && {
-       # use dnsmasq for local dns requests
-       rm -f /tmp/resolv.conf
-       cat > /tmp/resolv.conf <<EOF
-nameserver 127.0.0.1
-search lan
-EOF
-}

diff --git a/openwrt/package/dnsmasq/files/S60dnsmasq b/openwrt/package/dnsmasq/files/S60dnsmasq
new file mode 100755 (executable)
index 0000000..1699659
--- /dev/null
+++ b/openwrt/package/dnsmasq/files/S60dnsmasq
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# The following is to automatically configure the DHCP settings
+# based on nvram settings. Feel free to replace all this crap
+# with a simple "dnsmasq" and manage everything via the
+# /etc/dnsmasq.conf config file
+
+# DHCP interface (lan, wan, wifi -- any ifup *)
+iface=lan
+ifname=$(nvram get ${iface}_ifname)
+
+udhcpc -n -q -R -s /bin/true -i $ifname >&- || {
+  # no existing DHCP server?
+
+  # calculate settings
+   ipaddr=$(nvram get ${iface}_ipaddr)
+  netmask=$(nvram get ${iface}_netmask)
+    start=$(nvram get dhcp_start)
+      num=$(nvram get dhcp_num)
+
+  eval $(ipcalc $ipaddr $netmask ${start:-100} ${num:-150})
+  lease=$(nvram get dhcp_lease)
+  
+  # and pass the args via the commandline
+  # (because trying to edit the config from here is crazy)
+  args="-K -F $START,$END,$NETMASK,${lease:-12h}"
+}
+
+# ignore requests from wan interface
+wanproto=$(nvram get wan_proto)
+[ -z "$wanproto" -o "$wanproto" = "none" ] || args="${args} -I $(nvram get wan_ifname)"
+
+dnsmasq ${args} && {
+       # use dnsmasq for local dns requests
+       rm -f /tmp/resolv.conf
+       cat > /tmp/resolv.conf <<EOF
+nameserver 127.0.0.1
+search lan
+EOF
+}