modules/admin-full: allow vlan 0 for /proc/switch interface

[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 8c28cf9..69ef6b7 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -12,6 +12,7 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 module("luci.controller.admin.system", package.seeall)
 
 function index()
@@ -20,14 +21,15 @@ 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"}, cbi("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)
+       entry({"admin", "system", "startup"}, form("admin_system/startup"), i18n("Startup"), 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
@@ -105,9 +107,12 @@ function action_packages()
 end
 
 function action_backup()
+       local sys = require "luci.sys"
+       local fs  = require "luci.fs"
+
        local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
        local restore_cmd = "tar -xzC/ >/dev/null 2>&1"
-       local backup_cmd  = "tar -cz %s 2>/dev/null"
+       local backup_cmd  = "tar -czT %s 2>/dev/null"
 
        local restore_fpi
        luci.http.setfilehandler(
@@ -132,11 +137,22 @@ function action_backup()
                luci.template.render("admin_system/applyreboot")
                luci.sys.reboot()
        elseif backup then
-               local reader = ltn12_popen(backup_cmd:format(_keep_pattern()))
-               luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % {
-                       luci.sys.hostname(), os.date("%Y-%m-%d")})
-               luci.http.prepare_content("application/x-targz")
-               luci.ltn12.pump.all(reader, luci.http.write)
+               local filelist = "/tmp/luci-backup-list.%d" % os.time()
+
+               sys.call(
+                       "( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' /etc/sysupgrade.conf " ..
+                       "/lib/upgrade/keep.d/* 2>/dev/null) -type f 2>/dev/null; " ..
+                       "opkg list-changed-conffiles ) | sort -u > %s" % filelist
+               )
+
+               if fs.access(filelist) then
+                       local reader = ltn12_popen(backup_cmd:format(filelist))
+                       luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % {
+                               luci.sys.hostname(), os.date("%Y-%m-%d")})
+                       luci.http.prepare_content("application/x-targz")
+                       luci.ltn12.pump.all(reader, luci.http.write)
+                       fs.unlink(filelist)
+               end
        elseif reset then
                luci.template.render("admin_system/applyreboot")
                luci.util.exec("mtd -r erase rootfs_data")
@@ -249,8 +265,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