Changeset 6712

Timestamp:

01/13/11 14:15:31 (2 years ago)

Author:

soma

Message:

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

Files:

• luci/trunk/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua (modified) (1 diff)

luci/trunk/applications/luci-ffwizard/luasrc/model/cbi/ffwizard.lua

@@ -1358 +1358 @@
     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)
-    end
-
+    else
+            uci:foreach("dhcp", "dnsmasq", function(s)
+                    uci:set_list("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
+            end)
+    end
 
     uci:save("dhcp")