X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_system%2Ffstab.lua;h=3ce5351bf0efa54a1a8bd9e2e2c548aad820fb5f;hp=fd6175835b3a4d6b69fbaa54368648a98ec2afee;hb=4f04e6126ecae11df3cc0e71a4ae74f1cb1543fe;hpb=ec09e995a843a57ae9e66b63dc64634e94d0b4f1

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
index fd6175835..3ce5351bf 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
@@ -33,12 +33,67 @@ until not ln
 
 block:close()
 
-
 m = Map("fstab", translate("Mount Points"))
+s = m:section(TypedSection, "global", translate("Global Settings"))
+s.addremove = false
+s.anonymous = true
+
+detect = s:option(Button, "block_detect", translate("Generate Config"), translate("Find all currently attached filesystems and swap and replace configuration with defaults based on what was detected"))
+detect.inputstyle = "reload"
+
+detect.write = function(self, section)
+	luci.sys.call("block detect >/etc/config/fstab")
+	luci.http.redirect(luci.dispatcher.build_url("admin/system", "fstab"))
+end
+
+o = s:option(Flag, "anon_swap", translate("Anonymous Swap"), translate("Mount swap not specifically configured"))
+o.default = o.disabled
+o.rmempty = false
+
+o = s:option(Flag, "anon_mount", translate("Anonymous Mount"), translate("Mount filesystems not specifically configured"))
+o.default = o.disabled
+o.rmempty = false
+
+o = s:option(Flag, "auto_swap", translate("Automount Swap"), translate("Automatically mount swap on hotplug"))
+o.default = o.enabled
+o.rmempty = false
+
+o = s:option(Flag, "auto_mount", translate("Automount Filesystem"), translate("Automatically mount filesystems on hotplug"))
+o.default = o.enabled
+o.rmempty = false
+
+o = s:option(Flag, "check_fs", translate("Check filesystems before mount"), translate("Automatically check filesystem for errors before mounting"))
+o.default = o.disabled
+o.rmempty = false
 
 local mounts = luci.sys.mounts()
+local non_system_mounts = {}
+for rawmount, val in pairs(mounts) do
+    if (string.find(val.mountpoint, "/tmp/.jail") == nil) then
+      repeat 
+          val.umount = false
+          if (val.mountpoint == "/") then
+              break
+          elseif (val.mountpoint == "/overlay") then
+              break
+          elseif (val.mountpoint == "/rom") then
+              break
+          elseif (val.mountpoint == "/tmp") then
+              break
+          elseif (val.mountpoint == "/tmp/shm") then
+              break
+          elseif (val.mountpoint == "/tmp/upgrade") then
+              break
+          elseif (val.mountpoint == "/dev") then
+              break
+          end
+          val.umount = true
+      until true
+      non_system_mounts[rawmount] = val       
+   end   
+end
 
-v = m:section(Table, mounts, translate("Mounted file systems"))
+v = m:section(Table, non_system_mounts, translate("Mounted file systems"))
 
 fs = v:option(DummyValue, "fs", translate("Filesystem"))
 
@@ -61,7 +116,21 @@ function used.cfgvalue(self, section)
 	) .. ")"
 end
 
+unmount = v:option(Button, "unmount", translate("Unmount"))
+unmount.render = function(self, section, scope)
+	if non_system_mounts[section].umount then
+		self.title = translate("Unmount")
+		self.inputstyle = "remove"
+        	Button.render(self, section, scope)
+	end
+end
 
+unmount.write = function(self, section)
+	if non_system_mounts[section].umount then
+		luci.sys.call("/bin/umount '%s'" % luci.util.shellstartsqescape(non_system_mounts[section].mountpoint))
+		return luci.http.redirect(luci.dispatcher.build_url("admin/system", "fstab"))
+        end
+end
 
 mount = m:section(TypedSection, "mount", translate("Mount Points"), translate("Mount Points define at which point a memory device will be attached to the filesystem"))
 mount.anonymous = true
@@ -190,7 +259,12 @@ dev.cfgvalue = function(self, section)
 	if v then return "Label: %s" % v end
 
 	v = Value.cfgvalue(self, section) or "?"
-	return size[v] and "%s (%s MB)" % {v, size[v]} or v
+	e = v and devices[v]
+	if v and e and e.size then
+		return "%s (%s MB)" % {v, e.size}
+	else
+		return v
+	end
 end
 
 return m