[cosmetic] accommodate for 5 digits svn revisions :)

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 4fddc47..1aeeb94 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -36,6 +36,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"


@@ -52,6 +64,8 @@ dnsmasq() {
        append_bool "$cfg" dbus "-1"
        append_bool "$cfg" boguspriv "-b"
        append_bool "$cfg" expandhosts "-E"
        append_bool "$cfg" dbus "-1"
        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,12 +75,20 @@ 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 leasefile $cfg leasefile
        [ -e "$leasefile" ] || touch "$leasefile"
        config_get_bool cachelocal "$cfg" cachelocal 1
 
        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() {


@@ -174,7 +196,6 @@ dhcp_boot_add() {
        local cfg="$1"
 
        config_get name "$cfg" name
        local cfg="$1"
 
        config_get name "$cfg" name

-       [ -n "$name" ] || return 0

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


@@ -185,7 +206,7 @@ dhcp_boot_add() {
        config_get serveraddress "$cfg" serveraddress
        [ -n "$serveraddress" ] || return 0
 
        config_get serveraddress "$cfg" serveraddress
        [ -n "$serveraddress" ] || return 0
 

-       append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress"
+       append args "--dhcp-boot=${name:+net:$name,}$filename,$servername,$serveraddress"

 
        dhcp_option_add "$cfg" "$name"
 }
 
        dhcp_option_add "$cfg" "$name"
 }


@@ -207,7 +228,7 @@ dhcp_add() {
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 

-       append_bool "$cfg" ignore "-2 $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


@@ -219,7 +240,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