[package] kmod-libertas needs kmod-lib80211 to load

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 62e2f51..ba1bf72 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -3,6 +3,7 @@
 
 START=60
 DNS_SERVERS=""
 
 START=60
 DNS_SERVERS=""

+DOMAIN=""

 
 dhcp_calc() {
        local ip="$1"
 
 dhcp_calc() {
        local ip="$1"


@@ -36,6 +37,18 @@ append_parm() {
        append args "$switch $_loctmp"
 }
 
        append args "$switch $_loctmp"
 }
 

+append_server() {
+       append args "-S $1"
+}
+
+append_interface() {
+       append args "-i $1"
+}
+
+append_notinterface() {
+       append args "-I $1"
+}
+

 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"


@@ -49,9 +62,11 @@ dnsmasq() {
        append_bool "$cfg" noresolv "-R"
        append_bool "$cfg" localise_queries "-y"
        append_bool "$cfg" readethers "-Z"
        append_bool "$cfg" noresolv "-R"
        append_bool "$cfg" localise_queries "-y"
        append_bool "$cfg" readethers "-Z"

-       append_bool "$cfg" dbus "-l"
+       append_bool "$cfg" dbus "-1"

        append_bool "$cfg" boguspriv "-b"
        append_bool "$cfg" expandhosts "-E"
        append_bool "$cfg" boguspriv "-b"
        append_bool "$cfg" expandhosts "-E"

+       append_bool "$cfg" enable_tftp "--enable-tftp"
+       append_bool "$cfg" nonwildcard "-z"

 
        append_parm "$cfg" dnsforwardmax "-0"
        append_parm "$cfg" port "-p"
 
        append_parm "$cfg" dnsforwardmax "-0"
        append_parm "$cfg" port "-p"


@@ -61,8 +76,22 @@ dnsmasq() {
        append_parm "$cfg" "queryport" "-Q"
        append_parm "$cfg" "domain" "-s"
        append_parm "$cfg" "local" "-S"
        append_parm "$cfg" "queryport" "-Q"
        append_parm "$cfg" "domain" "-s"
        append_parm "$cfg" "local" "-S"

+       config_list_foreach "$cfg" "server" append_server
+       config_list_foreach "$cfg" "interface" append_interface
+       config_list_foreach "$cfg" "notinterface" append_notinterface

        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"

+       append_parm "$cfg" "tftp_root" "--tftp-root"
+       append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
+
+       config_get DOMAIN "$cfg" domain
+
+       config_get leasefile $cfg leasefile
+       [ -e "$leasefile" ] || touch "$leasefile"
+       config_get_bool cachelocal "$cfg" cachelocal 1
+
+       config_get hostsfile "$cfg" dhcphostsfile
+       [ -e "$hostsfile" ] && append args "--dhcp-hostsfile=$hostsfile"

 }
 
 dhcp_subscrid_add() {
 }
 
 dhcp_subscrid_add() {


@@ -139,7 +168,7 @@ dhcp_host_add() {
        local cfg="$1"
 
        config_get name "$cfg" name
        local cfg="$1"
 
        config_get name "$cfg" name

-       [ -n "$name" ] || return 0
+       [ -n "$name" ] && dhcp_option_add "$cfg" "$name"

 
        config_get mac "$cfg" mac
        [ -n "$mac" ] || return 0
 
        config_get mac "$cfg" mac
        [ -n "$mac" ] || return 0


@@ -147,9 +176,7 @@ dhcp_host_add() {
        config_get ip "$cfg" ip
        [ -n "$ip" ] || return 0
 
        config_get ip "$cfg" ip
        [ -n "$ip" ] || return 0
 

-       append args "--dhcp-host=$mac,$ip"
-
-       dhcp_option_add "$cfg" "$name"
+       append args "--dhcp-host=$mac,$ip${name:+,$name}"

 }
 
 dhcp_mac_add() {
 }
 
 dhcp_mac_add() {


@@ -166,6 +193,26 @@ dhcp_mac_add() {
        dhcp_option_add "$cfg" "$name"
 }
 
        dhcp_option_add "$cfg" "$name"
 }
 

+dhcp_boot_add() {
+       local cfg="$1"
+
+       config_get name "$cfg" name
+
+       config_get filename "$cfg" filename
+       [ -n "$filename" ] || return 0
+
+       config_get servername "$cfg" servername
+       [ -n "$servername" ] || return 0
+
+       config_get serveraddress "$cfg" serveraddress
+       [ -n "$serveraddress" ] || return 0
+
+       append args "--dhcp-boot=${name:+net:$name,}$filename,$servername,$serveraddress"
+
+       dhcp_option_add "$cfg" "$name"
+}
+
+

 dhcp_add() {
        local cfg="$1"
        config_get net "$cfg" interface
 dhcp_add() {
        local cfg="$1"
        config_get net "$cfg" interface


@@ -178,11 +225,11 @@ 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"
        }
 

-       append_bool "$cfg" ignore "-I $ifname"
+       append_bool "$cfg" ignore "-2 $ifname" && return 0

 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0
 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0


@@ -194,7 +241,7 @@ dhcp_add() {
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0
        [ "$force" -gt 0 ] || {
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0
        [ "$force" -gt 0 ] || {

-               udhcpc -n -q -R -s /bin/true -t 1 -i $ifname >&- && return 0
+               udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0

        }
 
        config_get start "$cfg" start
        }
 
        config_get start "$cfg" start


@@ -217,17 +264,27 @@ 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
 
 }
 

+dhcp_domain_add() {
+       local cfg="$1"
+
+       config_get name "$cfg" name
+       [ -n "$name" ] || return 0
+
+       config_get ip "$cfg" ip
+       [ -n "$ip" ] || return 0
+
+       local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS"
+       append args "-A /$name${DOMAIN:+.$DOMAIN}/$ip"
+       append args "--ptr-record=$4.$3.$2.$1.in-addr.arpa,$name${DOMAIN:+.$DOMAIN}"
+}
+

 start() {
        include /lib/network
        scan_interfaces
 start() {
        include /lib/network
        scan_interfaces


@@ -236,12 +293,14 @@ start() {
        args=""
        config_foreach dnsmasq dnsmasq
        config_foreach dhcp_host_add host
        args=""
        config_foreach dnsmasq dnsmasq
        config_foreach dhcp_host_add host

+       config_foreach dhcp_boot_add boot

        config_foreach dhcp_mac_add mac
        config_foreach dhcp_vendorclass_add vendorclass
        config_foreach dhcp_userclass_add userclass
        config_foreach dhcp_circuitid_add circuitid
        config_foreach dhcp_remoteid_add remoteid
        config_foreach dhcp_subscrid_add subscrid
        config_foreach dhcp_mac_add mac
        config_foreach dhcp_vendorclass_add vendorclass
        config_foreach dhcp_userclass_add userclass
        config_foreach dhcp_circuitid_add circuitid
        config_foreach dhcp_remoteid_add remoteid
        config_foreach dhcp_subscrid_add subscrid

+       config_foreach dhcp_domain_add domain

        config_foreach dhcp_add dhcp
 
        /usr/sbin/dnsmasq $args && {
        config_foreach dhcp_add dhcp
 
        /usr/sbin/dnsmasq $args && {


@@ -254,5 +313,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

 }
 }