luci-mod-admin-full: Enable reset in Luci also for ubi
authorHannu Nyman <hannu.nyman@iki.fi>
Wed, 23 Mar 2016 14:58:14 +0000 (16:58 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Wed, 23 Mar 2016 14:58:14 +0000 (16:58 +0200)
Enable reset in LuCI also for ubi based firmwares.

This closes #672

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
modules/luci-mod-admin-full/luasrc/controller/admin/system.lua

index d180da71b7cfdfda37338ff66609198705f31644..5b80f20783566180b844e3b4c1944ca4c0cbf2ec 100644 (file)
@@ -190,7 +190,7 @@ local function supports_sysupgrade()
 end
 
 local function supports_reset()
-       return (os.execute([[grep -sq '"rootfs_data"' /proc/mtd]]) == 0)
+       return (os.execute([[grep -sqE '"rootfs_data"|"ubi"' /proc/mtd]]) == 0)
 end
 
 local function storage_size()
@@ -351,7 +351,7 @@ function action_reset()
                        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")
                return
        end