add gpio related config symbols to generic config

[openwrt.git] / package / dnsmasq / files / dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 60ffc8c..4fddc47 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -66,6 +66,7 @@ dnsmasq() {
 
        config_get leasefile $cfg leasefile
        [ -e "$leasefile" ] || touch "$leasefile"
 
        config_get leasefile $cfg leasefile
        [ -e "$leasefile" ] || touch "$leasefile"

+       config_get_bool cachelocal "$cfg" cachelocal 1

 }
 
 dhcp_subscrid_add() {
 }
 
 dhcp_subscrid_add() {


@@ -202,7 +203,7 @@ dhcp_add() {
        [ -n "$ifname" ] || return 0
 
        config_get dnsserver "$net" dns
        [ -n "$ifname" ] || return 0
 
        config_get dnsserver "$net" dns

-       [ -n "$dnsserver" ] && {
+       [ "$cachelocal" = "0" -a -n "$dnsserver" ] && {

                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 


@@ -241,13 +242,9 @@ dhcp_option_add() {
        local cfg="$1"
        local name="$2"
 
        local cfg="$1"
        local name="$2"
 

-       for count in $(seq 0 100); do
-               eval current_value=\$CONFIG_"$cfg"_dhcp"$count"
-               if [ -z "$current_value" ]; then
-                       let "count-=1"
-                       break
-               fi
-               append args "-O $name","$current_value"
+       config_get dhcp_option "$cfg" dhcp_option
+       for o in $dhcp_option; do
+               append args "-O $name","$o"

        done
 
 }
        done
 
 }


@@ -279,5 +276,10 @@ start() {
 }
 
 stop() {
 }
 
 stop() {

+       [ -f /tmp/resolv.conf ] && {
+               rm -f /tmp/resolv.conf
+               ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+       }

        killall dnsmasq
        killall dnsmasq

+       return 0

 }
 }