[8.09] merge r18470
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 22 Nov 2009 11:54:05 +0000 (11:54 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 22 Nov 2009 11:54:05 +0000 (11:54 +0000)
SVN-Revision: 18471

package/dnsmasq/Makefile
package/dnsmasq/files/dnsmasq.init

index 5b712ed..44de5d6 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.47
-PKG_RELEASE:=3.2
+PKG_RELEASE:=3.3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
index 3f8dca9..05335de 100644 (file)
@@ -44,6 +44,10 @@ append_interface() {
        append args "-i $1"
 }
 
+append_addnhosts() {
+       append args "-H $1"
+}
+
 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
@@ -67,12 +71,12 @@ dnsmasq() {
        append_parm "$cfg" port "-p"
        append_parm "$cfg" ednspacket_max "-P"
        append_parm "$cfg" dhcpleasemax "-X"
-       append_parm "$cfg" "addnhosts" "-H"
        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" "addnhosts" append_addnhosts
        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"