modules/admin-full: move system/processes to status/processes

[project/luci.git] / modules / admin-full / luasrc / controller / admin / system.lua

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 834879d..c79397b 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -21,14 +21,14 @@ function index()
 
        entry({"admin", "system"}, alias("admin", "system", "system"), i18n("System"), 30).index = true
        entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("System"), 1)
+       entry({"admin", "system", "admin"}, form("admin_system/admin"), i18n("Administration"), 2)
        entry({"admin", "system", "packages"}, call("action_packages"), i18n("Software"), 10)
        entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"))
-       entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("Admin Password"), 20)
-       entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("<abbr title=\"Secure Shell\">SSH</abbr>-Keys"), 30)
-       entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("Processes"), 45)
 
        if nixio.fs.access("/etc/config/fstab") then
                entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("Mount Points"), 50)
+               entry({"admin", "system", "fstab", "mount"}, cbi("admin_system/fstab/mount"), nil).leaf = true
+               entry({"admin", "system", "fstab", "swap"},  cbi("admin_system/fstab/swap"),  nil).leaf = true
        end
 
        if nixio.fs.access("/sys/class/leds") then
@@ -264,8 +264,9 @@ function action_upgrade()
 
                        -- Now invoke sysupgrade
                        local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
-                       --local flash = ltn12_popen("/sbin/sysupgrade %q" % tmpfile)
-                       local flash = ltn12_popen("hexdump %q" % tmpfile)
+                       local flash = ltn12_popen("/sbin/sysupgrade %s %q" %{
+                               keepcfg and "" or "-n", tmpfile
+                       })
 
                        luci.ltn12.pump.all(flash, luci.http.write)
                end