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

CC luci-mod-admin-full: Enable reset in Luci also for ubi

Browse source 
Enable reset in LuCI also for ubi based firmwares.
Discussion at #672

Backport of 5b79e62c0a

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2016-03-29 10:37:29 +03:00
parent b7c182165f
commit 34dbc700c6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
View file

@ -171,7 +171,7 @@ function action_flashops()
local fs = require "nixio.fs" local fs = require "nixio.fs"
local upgrade_avail = fs.access("/lib/upgrade/platform.sh") local upgrade_avail = fs.access("/lib/upgrade/platform.sh")
local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0 local reset_avail = os.execute([[grep -E '"rootfs_data"|"ubi"' /proc/mtd >/dev/null 2>&1]]) == 0
local restore_cmd = "tar -xzC/ >/dev/null 2>&1" local restore_cmd = "tar -xzC/ >/dev/null 2>&1"
local backup_cmd = "sysupgrade --create-backup - 2>/dev/null" local backup_cmd = "sysupgrade --create-backup - 2>/dev/null"
@ -287,7 +287,7 @@ function action_flashops()
msg = luci.i18n.translate("The system is erasing the configuration partition now and will reboot itself when finished."), msg = luci.i18n.translate("The system is erasing the configuration partition now and will reboot itself when finished."),
addr = "192.168.1.1" addr = "192.168.1.1"
}) })
fork_exec("killall dropbear uhttpd; sleep 1; mtd -r erase rootfs_data") fork_exec("sleep 1; killall dropbear uhttpd; sleep 1; jffs2reset -y && reboot")
else else
-- --
-- Overview -- Overview