modules: Split luci-mod-full

Move some common elements to luci-base, and otherwise make three
packages out of status, system, and network.  They were mostly
separated already, but there were some shared elements between
status and network that are now in luci-base.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>

65 files changed, 99 insertions, 33 deletions

diff --git a/modules/luci-base/luasrc/controller/admin/index.lua b/modules/luci-base/luasrc/controller/admin/index.lua
index 39e6e573b..360298b1c 100644
--- a/modules/luci-base/luasrc/controller/admin/index.lua
+++ b/modules/luci-base/luasrc/controller/admin/index.lua
@@ -16,6 +16,8 @@ function index()
 		end
 	end
 
+	local uci = require("luci.model.uci").cursor()
+
 	local root = node()
 	if not root.target then
 		root.target = alias("admin")
@@ -23,6 +25,7 @@ function index()
 	end
 
 	local page   = node("admin")
+	
 	page.title   = _("Administration")
 	page.order   = 10
 	page.sysauth = "root"
@@ -61,6 +64,24 @@ function index()
 	page.index = true
 	toplevel_page(page, false, false)
 
+	if nixio.fs.access("/etc/config/dhcp") then
+		page = entry({"admin", "dhcplease_status"}, call("lease_status"), nil)
+		page.leaf = true
+	end
+
+	local has_wifi = false
+
+	uci:foreach("wireless", "wifi-device",
+		function(s)
+			has_wifi = true
+			return false
+		end)
+
+	if has_wifi then
+		page = entry({"admin", "wireless_assoclist"}, call("wifi_assoclist"), nil)
+		page.leaf = true
+	end
+
 	-- Logout is last
 	entry({"admin", "logout"}, call("action_logout"), _("Logout"), 999)
 end
@@ -80,3 +101,22 @@ function action_logout()
 
 	luci.http.redirect(dsp.build_url())
 end
+
+
+function lease_status()
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write('[')
+	luci.http.write_json(s.dhcp_leases())
+	luci.http.write(',')
+	luci.http.write_json(s.dhcp6_leases())
+	luci.http.write(']')
+end
+
+function wifi_assoclist()
+	local s = require "luci.tools.status"
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(s.wifi_assoclist())
+end
diff --git a/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
index ebb02e489..ebb02e489 100644
--- a/modules/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm
+++ b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm b/modules/luci-base/luasrc/view/lease_status.htm
index 8fbbdc947..15b6b6908 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
+++ b/modules/luci-base/luasrc/view/lease_status.htm
@@ -1,5 +1,5 @@
 <script type="text/javascript">//<![CDATA[
-	XHR.poll(5, '<%=url('admin/network/dhcplease_status')%>', null,
+	XHR.poll(5, '<%=url('admin/dhcplease_status')%>', null,
 		function(x, st)
 		{
 			var tb = document.getElementById('lease_status_table');
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm b/modules/luci-base/luasrc/view/wifi_assoclist.htm
index b6f84c060..700d998ad 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_assoclist.htm
+++ b/modules/luci-base/luasrc/view/wifi_assoclist.htm
@@ -17,7 +17,7 @@
 		return s;
 	}
 
-	XHR.poll(5, '<%=url('admin/network/wireless_assoclist')%>', null,
+	XHR.poll(5, '<%=url('admin/wireless_assoclist')%>', null,
 		function(x, st)
 		{
 			var tb = document.getElementById('wifi_assoclist_table');
diff --git a/modules/luci-mod-admin-full/Makefile b/modules/luci-mod-admin-full/Makefile
index 36ddf13f1..b376b35e5 100644
--- a/modules/luci-mod-admin-full/Makefile
+++ b/modules/luci-mod-admin-full/Makefile
@@ -7,9 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Administration - full-featured for full control
-LUCI_DEPENDS:=+luci-base
+LUCI_DEPENDS:=+luci-base +luci-mod-status +luci-mod-system +luci-mod-network
 
-PKG_BUILD_DEPENDS:=iwinfo
 PKG_LICENSE:=Apache-2.0
 
 include ../../luci.mk
diff --git a/modules/luci-mod-network/Makefile b/modules/luci-mod-network/Makefile
new file mode 100644
index 000000000..5958765da
--- /dev/null
+++ b/modules/luci-mod-network/Makefile
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Network Administration
+LUCI_DEPENDS:=+luci-base +libiwinfo-lua
+
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-network/luasrc/controller/admin/network.lua
index c4e1c3aa1..a587b7e51 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-network/luasrc/controller/admin/network.lua
@@ -37,9 +37,6 @@ function index()
 			end)
 
 		if has_wifi then
-			page = entry({"admin", "network", "wireless_assoclist"}, call("wifi_assoclist"), nil)
-			page.leaf = true
-
 			page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil)
 			page.leaf = true
 
@@ -110,9 +107,6 @@ function index()
 			page.title  = _("DHCP and DNS")
 			page.order  = 30
 
-			page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
-			page.leaf = true
-
 			page = node("admin", "network", "hosts")
 			page.target = cbi("admin_network/hosts")
 			page.title  = _("Hostnames")
@@ -302,14 +296,6 @@ function wifi_reconnect(radio)
 	end
 end
 
-function wifi_assoclist()
-	local s = require "luci.tools.status"
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(s.wifi_assoclist())
-end
-
-
 local function _wifi_get_scan_results(cache_key)
 	local results = luci.util.ubus("session", "get", {
 		ubus_rpc_session = luci.model.uci:get_session_id(),
@@ -381,17 +367,6 @@ function wifi_scan_results(radio)
 	end
 end
 
-function lease_status()
-	local s = require "luci.tools.status"
-
-	luci.http.prepare_content("application/json")
-	luci.http.write('[')
-	luci.http.write_json(s.dhcp_leases())
-	luci.http.write(',')
-	luci.http.write_json(s.dhcp6_leases())
-	luci.http.write(']')
-end
-
 function switch_status(switches)
 	local s = require "luci.tools.status"
 
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua
index ae8a95f9c..3ac49d635 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua
@@ -266,7 +266,7 @@ o = s:taboption("general", DynamicList, "notinterface",
 o.optional = true
 o:depends("nonwildcard", true)
 
-m:section(SimpleSection).template = "admin_network/lease_status"
+m:section(SimpleSection).template = "lease_status"
 
 s = m:section(TypedSection, "host", translate("Static Leases"),
 	translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " ..
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua
index 46945af58..46945af58 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/hosts.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/hosts.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua
index ca66e9f36..ca66e9f36 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
index 8be354b44..8be354b44 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua
index 799386d29..799386d29 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/proto_ahcp.lua
index 0818199a9..0818199a9 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/proto_ahcp.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/proto_ahcp.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua
index 1970f36a2..1970f36a2 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/routes.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua
index d79b3c470..d79b3c470 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
index 743efaa1e..743efaa1e 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua
index e8a305882..e8a305882 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
index ad20f0918..3bffb3502 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_overview.lua
@@ -216,7 +216,7 @@ s = m:section(NamedSection, "__assoclist__")
 function s.render(self, sid)
 	tpl.render_string([[
 		<h2><%:Associated Stations%></h2>
-		<%+admin_network/wifi_assoclist%>
+		<%+wifi_assoclist%>
 	]])
 end
 
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm
index 03dd5aab2..03dd5aab2 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm
index 7427154a0..7427154a0 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/iface_overview_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm
index 34be35dd2..34be35dd2 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/iface_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
index 68f0bbc9d..68f0bbc9d 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm
index 987123642..987123642 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/wifi_join.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm
index 9730bc2c9..9730bc2c9 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/wifi_overview_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm
index bfad3d080..bfad3d080 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
+++ b/modules/luci-mod-network/luasrc/view/admin_network/wifi_status.htm
diff --git a/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full b/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full
index 372eb1512..372eb1512 100755
--- a/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full
+++ b/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full
diff --git a/modules/luci-mod-status/Makefile b/modules/luci-mod-status/Makefile
new file mode 100644
index 000000000..cf8c8ddf8
--- /dev/null
+++ b/modules/luci-mod-status/Makefile
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Status Pages
+LUCI_DEPENDS:=+luci-base +libiwinfo +libiwinfo-lua
+
+PKG_BUILD_DEPENDS:=iwinfo
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg b/modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg
index 5a121b85c..5a121b85c 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/bandwidth.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg b/modules/luci-mod-status/htdocs/luci-static/resources/connections.svg
index 5794e7942..5794e7942 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/connections.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg b/modules/luci-mod-status/htdocs/luci-static/resources/load.svg
index 716d37617..716d37617 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/load.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/load.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg b/modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg
index e75ea614c..e75ea614c 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/wifirate.svg
diff --git a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg b/modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg
index 00cc2a12f..00cc2a12f 100644
--- a/modules/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/wireless.svg
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua b/modules/luci-mod-status/luasrc/controller/admin/status.lua
index 4f04cce54..4f04cce54 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua
+++ b/modules/luci-mod-status/luasrc/controller/admin/status.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua b/modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua
index 0a6e48fd8..0a6e48fd8 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_status/processes.lua
+++ b/modules/luci-mod-status/luasrc/model/cbi/admin_status/processes.lua
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm
index 3bb55f905..3bb55f905 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/bandwidth.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm
index 0a0db3be7..0a0db3be7 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm
index 1a8770ef8..1a8770ef8 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/dmesg.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-status/luasrc/view/admin_status/index.htm
index 8820ae1cf..3edfd9204 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/index.htm
@@ -442,7 +442,7 @@
 
 <%
 	if has_dhcp then
-		include("admin_network/lease_status")
+		include("lease_status")
 	end
 %>
 
@@ -468,7 +468,7 @@
 <div class="cbi-section">
 	<h3><%:Associated Stations%></h3>
 
-	<%+admin_network/wifi_assoclist%>
+	<%+wifi_assoclist%>
 </div>
 <% end %>
 
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm
index 51e428e40..51e428e40 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/iptables.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-status/luasrc/view/admin_status/load.htm
index bced06fa2..bced06fa2 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/load.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm b/modules/luci-mod-status/luasrc/view/admin_status/routes.htm
index 74779f6ad..74779f6ad 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/routes.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm
index fb734a76d..fb734a76d 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/syslog.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
index 8ec43cb0e..8ec43cb0e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
+++ b/modules/luci-mod-status/luasrc/view/admin_status/wireless.htm
diff --git a/modules/luci-mod-admin-full/src/Makefile b/modules/luci-mod-status/src/Makefile
index d6ed8c6e4..d6ed8c6e4 100644
--- a/modules/luci-mod-admin-full/src/Makefile
+++ b/modules/luci-mod-status/src/Makefile
diff --git a/modules/luci-mod-admin-full/src/luci-bwc.c b/modules/luci-mod-status/src/luci-bwc.c
index 8ddd91727..8ddd91727 100644
--- a/modules/luci-mod-admin-full/src/luci-bwc.c
+++ b/modules/luci-mod-status/src/luci-bwc.c
diff --git a/modules/luci-mod-system/Makefile b/modules/luci-mod-system/Makefile
new file mode 100644
index 000000000..a6d5a7a45
--- /dev/null
+++ b/modules/luci-mod-system/Makefile
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Administration - Global System Settings
+LUCI_DEPENDS:=+luci-base
+
+PKG_LICENSE:=Apache-2.0
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
+
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua
index 4e83769ee..4e83769ee 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-system/luasrc/controller/admin/system.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/admin.lua
index 6c1c1235c..6c1c1235c 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/admin.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua
index ee2401e93..ee2401e93 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/backupfiles.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua
index 016a6199a..016a6199a 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/crontab.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/crontab.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua
index 3ce5351bf..3ce5351bf 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua
index a85872afa..a85872afa 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua
index 82468d5fc..82468d5fc 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/swap.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/ipkg.lua
index 7c6d7e1c6..7c6d7e1c6 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/ipkg.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/ipkg.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua
index 2ea044e16..2ea044e16 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/leds.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
index 9e19ac50a..9e19ac50a 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/startup.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/startup.lua
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua
index c7fdfcddb..c7fdfcddb 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm
index e235bd467..e235bd467 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/applyreboot.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm b/modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm
index c1f3361ae..c1f3361ae 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/backupfiles.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/backupfiles.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm b/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm
index 37d8ae0e8..37d8ae0e8 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/clock_status.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-system/luasrc/view/admin_system/flashops.htm
index 8204d38e3..8204d38e3 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/flashops.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm b/modules/luci-mod-system/luasrc/view/admin_system/ipkg.htm
index a7ff4e50b..a7ff4e50b 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/ipkg.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/ipkg.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm
index 280eabb8e..280eabb8e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/packages.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm b/modules/luci-mod-system/luasrc/view/admin_system/reboot.htm
index d23664ada..d23664ada 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/reboot.htm
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm
index 597ddfd6b..597ddfd6b 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/luci-mod-system/luasrc/view/admin_system/upgrade.htm