Changeset 1435d00 in freewrt

Timestamp:

Jun 18, 2006, 7:16:02 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

76c5e9f

Parents:

5f931bf9

Message:

change to a very KISS like startup script. no magic at all.
works for every system without having special vars. everything
is configured in /etc/dnsmasq.conf.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@107 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/dnsmasq/files

Files:

• dnsmasq.conf (modified) (1 diff)
• dnsmasq.init (modified) (1 diff)

package/dnsmasq/files/dnsmasq.conf

@@ -10 +10 @@
 expand-hosts
 
-@ifdef dhcp_enable
-dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@
-@endif
-@ifdef wan_ifname
-except-interface=@@wan_ifname@@
-@endif
+# add more dhcp-range options for every subnet
+dhcp-range=192.168.1.100,192.168.1.254,255.255.255.0,24h
+except-interface=vlan1
 
-# enable dhcp (start,end,netmask,leasetime)
 dhcp-authoritative
 dhcp-leasefile=/tmp/dhcp.leases
 
-# use /etc/ethers for static hosts; same format as --dhcp-host
+# use /etc/ethers for static hosts
 # <hwaddr> <ipaddr>
-read-ethers
+#read-ethers
 
 # other useful options:

package/dnsmasq/files/dnsmasq.init

@@ -1 +1 @@
 #!/bin/sh
-. /etc/config/network
-
-# The following is to automatically configure the DHCP settings
-# based on config settings. Feel free to replace all this crap
-# with a simple "dnsmasq" and manage everything via the
-# /etc/dnsmasq.conf config file
 
 [ -f /etc/dnsmasq.conf ] || exit
 
-args=""
-iface=lan
-eval "ifname=\${${iface}_ifname}"
+case $1 in
+start)
+        /usr/sbin/dnsmasq
+        ;;
+stop)
+        killall dnsmasq
+restart)
+        $0 stop
+        $0 start
+        ;;
+*)
+        echo "Usage: $0 {start | stop | restart}"
+        ;;
+esac
+exit 0
 
-dhcp_enable="${dhcp_enable:-1}"
-dhcp_start="${dhcp_start:-100}"
-dhcp_num="${dhcp_num:-50}"
-dhcp_lease="${dhcp_lease:-12h}"
-
-# if dhcp_enable is unset and there is a dhcp server on the network already, default to dhcp_enable=0
-[ -z "$dhcp_enable" ] && udhcpc -n -q -R -s /bin/true -i $ifname >&- && dhcp_enable="${dhcp_enable:-0}"
-
-# dhcp_enable=0 disables the dhcp server
-(
-        [ -z "$dhcp_enable" -o "$dhcp_enable" -eq 1 ] && {
-                # no existing DHCP server?
-
-                # calculate settings
-                eval "ipaddr=\${${iface}_ipaddr}"
-                eval "netmask=\${${iface}_netmask}"
-                eval $(ipcalc $ipaddr $netmask ${dhcp_start:-100} ${dhcp_num:-150})
-                
-                # and pass the args via config parser defines
-                echo "@define dhcp_enable 1"
-                echo "@define netmask $NETMASK"
-                echo "@define start $START"
-                echo "@define end $END"
-                echo "@define lease ${dhcp_lease:-12h}"
-        }
-
-        # ignore requests from wan interface
-        [ -z "$wan_proto" -o "$wan_proto" = "none" ] || echo "@define wan_ifname $wan_ifname"
-
-        cat /etc/dnsmasq.conf
-) | awk -f /usr/lib/parse-config.awk | dnsmasq -C /proc/self/fd/0