From: Manuel Munz <freifunk@somakoma.de>
Date: Thu, 13 Jan 2011 13:15:31 +0000 (+0000)
Subject: applications/ffwizard: addnhosts for dnsmasq was not set properly when using 6and4... 
X-Git-Tag: 0.11.0~2393
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=71515db03a6bfb0bf4a7ee9d3f4eb103b43776ea

applications/ffwizard: addnhosts for dnsmasq was not set properly when using 6and4 olsrd mode
---

diff --git a/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua
index f963c16fd..d9d1c0ef9 100644
--- a/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua
@@ -1357,17 +1357,16 @@ function main.write(self, section, value)
 	uci:save("olsrd")
 	uci:save("dhcp")
 	-- Import hosts and set domain
-	uci:foreach("dhcp", "dnsmasq", function(s)
-		uci:set_list("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
-	end)
-
 	if has_ipv6 then
 	        uci:foreach("dhcp", "dnsmasq", function(s)
-	                uci:set_list("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr.ipv6")
+	                uci:set_list("dhcp", s[".name"], "addnhosts", {"/var/etc/hosts.olsr","/var/etc/hosts.olsr.ipv6"})
 	        end)
+	else
+	        uci:foreach("dhcp", "dnsmasq", function(s)
+	                uci:set_list("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
+        	end)
 	end
 
-
 	uci:save("dhcp")
 
 	-- Internet sharing