X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a47a7d1cc91bf6ee252b75e506b987999d38495d..315fb2270ee2813321c78f33ec4ad60ad7ec44a4:/package/dnsmasq/files/dnsmasq.init?ds=inline

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 79e57d5f3..b5ecf1de2 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -36,6 +36,14 @@ append_parm() {
 	append args "$switch $_loctmp"
 }
 
+append_server() {
+	append args "-S $1"
+}
+
+append_interface() {
+	append args "-i $1"
+}
+
 dnsmasq() {
 	local cfg="$1"
 	append_bool "$cfg" authoritative "-K"
@@ -52,6 +60,8 @@ dnsmasq() {
 	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"
@@ -61,12 +71,19 @@ dnsmasq() {
 	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
 	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 hostsfile "$cfg" dhcphostsfile
+	[ -e "$hostsfile" ] && append args "--dhcp-hostsfile=$hostsfile"
 }
 
 dhcp_subscrid_add() {
@@ -174,7 +191,6 @@ dhcp_boot_add() {
 	local cfg="$1"
 
 	config_get name "$cfg" name
-	[ -n "$name" ] || return 0
 
 	config_get filename "$cfg" filename
 	[ -n "$filename" ] || return 0
@@ -185,7 +201,7 @@ dhcp_boot_add() {
 	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"
 }
@@ -207,7 +223,7 @@ dhcp_add() {
 		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
@@ -219,7 +235,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 ] || {
-		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
@@ -242,13 +258,9 @@ dhcp_option_add() {
 	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
 
 }
@@ -280,5 +292,10 @@ start() {
 }
 
 stop() {
+	[ -f /tmp/resolv.conf ] && {
+		rm -f /tmp/resolv.conf
+		ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+	}
 	killall dnsmasq
+	return 0
 }