Fixed last commit

diff --git a/modules/admin-core/luasrc/tools/webadmin.lua b/modules/admin-core/luasrc/tools/webadmin.lua
new file mode 100644 (file)
index 0000000..45bd910
--- /dev/null
+++ b/modules/admin-core/luasrc/tools/webadmin.lua
@@ -0,0 +1,26 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.tools.webadmin", package.seeall)
+
+function cbi_add_networks(field)
+       luci.model.uci.foreach("network", "interface",
+               function (section)
+                       if section[".name"] ~= "loopback" then
+                               field:value(section[".name"])
+                       end
+               end
+       )
+end
\ No newline at end of file

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 9065636836e77a536d02decb85bfaaadaf8d9a0d..681bfcd6dba9093df33adbb805f6eabfc6e725d3 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -13,10 +13,9 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 arg[1] = arg[1] or ""
-
 m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
 
-s = m:section(NamedSection, arg[1], "interface", translate("interfaces"))
+s = m:section(NamedSection, arg[1], "interface")
 s.addremove = true
 
 p = s:option(ListValue, "proto", translate("protocol"))

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
index c79dc8359d1a8b92bece4c3f1316f44886b8fb73..75c9f281851de63eaf8dc06ea7b97fcdbfd7e92c 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -52,6 +52,9 @@ end
 ipaddr = s:option(DummyValue, "ipaddr", translate("ipaddress"))
 ipaddr.stateful = true
 
+ip6addr = s:option(DummyValue, "ip6addr", translate("ip6address"))
+ip6addr.stateful = true
+
 function ipaddr.cfgvalue(self, section)
        local ip = self.map:stateget(section, "ipaddr")
        local nm = self.map:stateget(section, "netmask")