X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fsystem.lua;h=95961f49db4dbfe4b46d3dd8174c7518777016f1;hp=2e71e79024261e431ac511e061c74cd03ae9c4f9;hb=2e0fbbadc546e37baf13416e66aa5173ca604f5c;hpb=0ba2c5c66135d9f38e14deda5c97d6f5965d6a0c

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 2e71e7902..95961f49d 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -29,6 +29,8 @@ function index()
 
 	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,7 +266,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("/sbin/sysupgrade %s %q" %{
+				keepcfg and "" or "-n", tmpfile
+			})
 
 			luci.ltn12.pump.all(flash, luci.http.write)
 		end