applications/ffwizard: addnhosts for dnsmasq was not set properly when using 6and4...

diff --git a/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua
index f963c16..d9d1c0e 100644 (file)
--- 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: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)
        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)
                end)

+       else
+               uci:foreach("dhcp", "dnsmasq", function(s)
+                       uci:set_list("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
+               end)

        end
 
        end
 

-

        uci:save("dhcp")
 
        -- Internet sharing
        uci:save("dhcp")
 
        -- Internet sharing