set dhcp lease file in dnsmasq.conf instead of /tmp/dhcp.leases

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2904 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/dnsmasq/files/S50dnsmasq b/openwrt/package/dnsmasq/files/S50dnsmasq
index e913b8b..17e331f 100755 (executable)
--- a/openwrt/package/dnsmasq/files/S50dnsmasq
+++ b/openwrt/package/dnsmasq/files/S50dnsmasq
@@ -25,6 +25,6 @@ udhcpc -n -q -R -s /bin/true -i $ifname >&- || {
   wanproto=$(nvram get wan_proto)
   [ -z "$wanproto" -o "$wanproto" = "none" ] || wanif=$(nvram get wan_ifname)
   
   wanproto=$(nvram get wan_proto)
   [ -z "$wanproto" -o "$wanproto" = "none" ] || wanif=$(nvram get wan_ifname)
   

-  args="-l /tmp/dhcp.leases -K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h ${wanif:+-I ${wanif} }"
+  args="-K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h ${wanif:+-I ${wanif} }"

 }
 dnsmasq ${args}
 }
 dnsmasq ${args}

diff --git a/openwrt/package/dnsmasq/files/dnsmasq.conf b/openwrt/package/dnsmasq/files/dnsmasq.conf
index b4bdd4b..d4a9f08 100644 (file)
--- a/openwrt/package/dnsmasq/files/dnsmasq.conf
+++ b/openwrt/package/dnsmasq/files/dnsmasq.conf
@@ -12,7 +12,7 @@ expand-hosts
 # enable dhcp (start,end,netmask,leasetime)
 dhcp-authoritative
 #dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h
 # enable dhcp (start,end,netmask,leasetime)
 dhcp-authoritative
 #dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h

-#dhcp-leasefile=/tmp/dhcp.leases
+dhcp-leasefile=/tmp/dhcp.leases

 
 # use /etc/ethers for static hosts; same format as --dhcp-host
 # <hwaddr> <ipaddr>
 
 # use /etc/ethers for static hosts; same format as --dhcp-host
 # <hwaddr> <ipaddr>