Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-advanced-reboot: better information for snapshots

Browse source 
Signed-off-by: Stan Grishin <stangri@melmac.net>
This commit is contained in:
Stan Grishin 2019-11-27 08:32:15 -07:00
parent 4a08fdd2d3
commit 7483c13012
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-advanced-reboot/Makefile
View file

@ -13,7 +13,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=45 PKG_RELEASE:=46
include ../../luci.mk include ../../luci.mk

6
applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua
View file

@ -37,12 +37,18 @@ function get_partition_os_info(op_ubi)
local cp_info, ap_info local cp_info, ap_info
if fs.access("/etc/os-release") then if fs.access("/etc/os-release") then
cp_info = util.trim(util.exec('. /etc/os-release && echo "$PRETTY_NAME"')) cp_info = util.trim(util.exec('. /etc/os-release && echo "$PRETTY_NAME"'))
if cp_info:find("SNAPSHOT") then
cp_info = util.trim(util.exec('. /etc/os-release && echo "$OPENWRT_RELEASE"'))
end
end end
logger(i18n.translate("attempting to mount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")") logger(i18n.translate("attempting to mount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")")
alt_partition_unmount(op_ubi) alt_partition_unmount(op_ubi)
alt_partition_mount(op_ubi) alt_partition_mount(op_ubi)
if fs.access("/alt/rom/etc/os-release") then if fs.access("/alt/rom/etc/os-release") then
ap_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$PRETTY_NAME"')) ap_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$PRETTY_NAME"'))
if ap_info:find("SNAPSHOT") then
ap_info = util.trim(util.exec('. /alt/rom/etc/os-release && echo "$OPENWRT_RELEASE"'))
end
end end
logger(i18n.translate("attempting to unmount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")") logger(i18n.translate("attempting to unmount alternative partition") .. " (mtd" .. tostring(op_ubi) .. ")")
alt_partition_unmount(op_ubi) alt_partition_unmount(op_ubi)