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

Merge pull request #1576 from stangri/luci-app-advanced-reboot

Browse source 
luci-app-advanced-reboot: fixed bug on devices/board names with dashe…
This commit is contained in:
Hannu Nyman 2018-01-21 15:25:41 +02:00 committed by GitHub
commit cfd6f9bdb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 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
LUCI_PKGARCH:=all
PKG_RELEASE:=25
PKG_RELEASE:=26
include ../../luci.mk

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

@ -3,7 +3,7 @@
module("luci.controller.advanced_reboot", package.seeall)
-- device, board_name, part1, part2, offset, env_var_1, value_1_1, value_1_2, env_var_2, value_2_1, value_2_2
-- device_name, board_name, part1, part2, offset, env_var_1, value_1_1, value_1_2, env_var_2, value_2_1, value_2_2
devices = {
{"Linksys EA3500", "linksys-audi", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
{"Linksys E4200v2/EA4500", "linksys-viper", "mtd3", "mtd5", 32, "boot_part", 1, 2, "bootcmd", "run nandboot", "run altnandboot"},
@ -17,9 +17,10 @@ devices = {
}
errorMessage = ""
board_name = luci.util.trim(luci.sys.exec("cat /tmp/sysinfo/board_name"))
device_board_name = luci.util.trim(luci.sys.exec("cat /tmp/sysinfo/board_name"))
for i=1, #devices do
if board_name and string.match(board_name, devices[i][2]) then
table_board_name = devices[i][2]:gsub('-','')
if device_board_name and device_board_name:gsub('-',''):match(table_board_name) then
device_name = devices[i][1]
partition_one_mtd = devices[i][3] or nil
partition_two_mtd = devices[i][4] or nil