X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a47a7d1cc91bf6ee252b75e506b987999d38495d..f6d79ced81e5fff18e83d28c59da8ba079c2ba54:/package/dnsmasq/files/dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 79e57d5f3..7d32be077 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -52,6 +52,7 @@ dnsmasq() {
 	append_bool "$cfg" dbus "-1"
 	append_bool "$cfg" boguspriv "-b"
 	append_bool "$cfg" expandhosts "-E"
+	append_bool "$cfg" enable_tftp "--enable-tftp"
 
 	append_parm "$cfg" dnsforwardmax "-0"
 	append_parm "$cfg" port "-p"
@@ -63,6 +64,8 @@ dnsmasq() {
 	append_parm "$cfg" "local" "-S"
 	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"
@@ -242,13 +245,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 +279,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
 }