luci-mod-system: use declarative dependencies in controller
authorJo-Philipp Wich <jo@mein.io>
Thu, 31 Oct 2019 18:04:04 +0000 (19:04 +0100)
committerJo-Philipp Wich <jo@mein.io>
Fri, 1 Nov 2019 11:03:33 +0000 (12:03 +0100)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
modules/luci-mod-system/luasrc/controller/admin/system.lua

index 2913a23ef241aa8b816114a9ee9166569a4d3151..1e0bebb4f9cf38be3971077fa3ce01ece6eaee52 100644 (file)
@@ -5,29 +5,25 @@
 module("luci.controller.admin.system", package.seeall)
 
 function index()
-       local fs = require "nixio.fs"
-
        entry({"admin", "system", "system"}, view("system/system"), _("System"), 1)
 
        entry({"admin", "system", "admin"}, firstchild(), _("Administration"), 2)
        entry({"admin", "system", "admin", "password"}, view("system/password"), _("Router Password"), 1)
 
-       if fs.access("/etc/config/dropbear") then
-               entry({"admin", "system", "admin", "dropbear"}, view("system/dropbear"), _("SSH Access"), 2)
-               entry({"admin", "system", "admin", "sshkeys"}, view("system/sshkeys"), _("SSH-Keys"), 3)
-       end
+       entry({"admin", "system", "admin", "dropbear"}, view("system/dropbear"), _("SSH Access"), 2)
+               .uci_depends = { dropbear = true }
+
+       entry({"admin", "system", "admin", "sshkeys"}, view("system/sshkeys"), _("SSH-Keys"), 3)
+               .uci_depends = { dropbear = true }
 
        entry({"admin", "system", "startup"}, view("system/startup"), _("Startup"), 45)
        entry({"admin", "system", "crontab"}, view("system/crontab"), _("Scheduled Tasks"), 46)
 
-       if fs.access("/sbin/block") and fs.access("/etc/config/fstab") then
-               entry({"admin", "system", "mounts"}, view("system/mounts"), _("Mount Points"), 50)
-       end
+       entry({"admin", "system", "mounts"}, view("system/mounts"), _("Mount Points"), 50)
+               .file_depends = { "/sbin/block" }
 
-       local nodes, number = fs.glob("/sys/class/leds/*")
-       if number > 0 then
-               entry({"admin", "system", "leds"}, view("system/leds"), _("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
-       end
+       entry({"admin", "system", "leds"}, view("system/leds"), _("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
+               .file_depends = { "/sys/class/leds" }
 
        entry({"admin", "system", "flash"}, view("system/flash"), _("Backup / Flash Firmware"), 70)