summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-advanced-reboot/luasrc
diff options
context:
space:
mode:
authorStan Grishin <stangri@melmac.net>2019-11-19 16:55:22 -0700
committerStan Grishin <stangri@melmac.net>2019-11-19 16:55:22 -0700
commitffef73a141ced4351ee34e4cdbe53b3112cf7768 (patch)
treed1ce59d08cbf11b2ebd4fde6f08947ee0677bd8a /applications/luci-app-advanced-reboot/luasrc
parentcfd4db26edf6a9d8e307383ba19244a5227ae2a1 (diff)
luci-app-advanced-reboot: add logger messages, README update
Signed-off-by: Stan Grishin <stangri@melmac.net>
Diffstat (limited to 'applications/luci-app-advanced-reboot/luasrc')
-rw-r--r--applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua12
1 files changed, 10 insertions, 2 deletions
diff --git a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
index e1e63bcbf..112ac8a0d 100644
--- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
+++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
@@ -15,6 +15,11 @@ local http = require "luci.http"
local sys = require "luci.sys"
local dispatcher = require "luci.dispatcher"
local uci = require "luci.model.uci".cursor()
+local packageName = "luci-app-advanced-reboot"
+
+function logger(t)
+ util.exec("logger -t " .. packageName .. " '" .. tostring(t) .. "'")
+end
function is_alt_mountable(p1_mtd, p2_mtd)
if p1_mtd:sub(1,3) == "mtd" and
@@ -33,11 +38,13 @@ function get_partition_os_info(op_ubi)
if fs.access("/etc/os-release") then
cp_info = util.trim(util.exec('. /etc/os-release && echo "$PRETTY_NAME"'))
end
+ logger(i18n.translate("attempting to mount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")")
alt_partition_unmount(op_ubi)
alt_partition_mount(op_ubi)
if fs.access("/alt/rom/etc/os-release") then
ap_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$PRETTY_NAME"'))
end
+ logger(i18n.translate("attempting to unmount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")")
alt_partition_unmount(op_ubi)
return cp_info, ap_info
end
@@ -58,10 +65,12 @@ function alt_partition_mount(op_ubi)
end
function alt_partition_unmount(op_ubi)
+ local mtdCount = tonumber(util.exec("ubinfo | grep 'Present UBI devices' | grep -c ','"))
+ mtdCount = mtdCount and mtdCount + 1 or 10
-- util.exec("[ -d /alt/firmware ] && umount /alt/firmware")
util.exec("[ -d /alt/overlay ] && umount /alt/overlay")
util.exec("[ -d /alt/rom ] && umount /alt/rom")
- for i = 0, 10 do
+ for i = 0, mtdCount do
if not fs.access("/sys/devices/virtual/ubi/ubi" .. tostring(i) .. "/mtd_num") then break end
ubi_mtd = tonumber(util.trim(util.exec("cat /sys/devices/virtual/ubi/ubi" .. i .. "/mtd_num")))
if ubi_mtd and ubi_mtd == op_ubi then
@@ -266,7 +275,6 @@ function action_altreboot()
end
function action_poweroff()
- local uci = require "luci.model.uci".cursor()
if http.formvalue("cancel") then
http.redirect(dispatcher.build_url('admin/system/advanced_reboot'))
return