luci-mod-admin-full: use fs.glob instead nixio.fs.glob

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

diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
index fd6dda1..6fcd66f 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
@@ -27,7 +27,8 @@ function index()
                entry({"admin", "system", "fstab", "swap"},  cbi("admin_system/fstab/swap"),  nil).leaf = true
        end
 
-       if fs.access("/sys/class/leds") then
+       local nodes, number = fs.glob("/sys/class/leds/*")
+       if number > 0 then
                entry({"admin", "system", "leds"}, cbi("admin_system/leds"), _("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
        end
 
@@ -52,6 +53,7 @@ function action_clock_status()
                        luci.sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d'" %{
                                date.year, date.month, date.day, date.hour, date.min, date.sec
                        })
+                       luci.sys.call("/etc/init.d/sysfixtime restart")
                end
        end
 
@@ -185,12 +187,16 @@ local function image_checksum(image)
        return (luci.sys.exec("md5sum %q" % image):match("^([^%s]+)"))
 end
 
+local function image_sha256_checksum(image)
+       return (luci.sys.exec("sha256sum %q" % image):match("^([^%s]+)"))
+end
+
 local function supports_sysupgrade()
        return nixio.fs.access("/lib/upgrade/platform.sh")
 end
 
 local function supports_reset()
-       return (os.execute([[grep -sqE '"rootfs_data"|"ubi"' /proc/mtd]]) == 0)
+       return (os.execute([[grep -sq "^overlayfs:/overlay / overlay " /proc/mounts]]) == 0)
 end
 
 local function storage_size()
@@ -268,6 +274,7 @@ function action_sysupgrade()
                if image_supported(image_tmp) then
                        luci.template.render("admin_system/upgrade", {
                                checksum = image_checksum(image_tmp),
+                               sha256ch = image_sha256_checksum(image_tmp),
                                storage  = storage_size(),
                                size     = (fs.stat(image_tmp, "size") or 0),
                                keep     = (not not http.formvalue("keep"))