Trigger post-flash reboot manually

diff --git a/contrib/package/luci-addons/dist/sbin/luci-flash b/contrib/package/luci-addons/dist/sbin/luci-flash
index 07434b5073d30e7619535a8a43411be15070149a..79bc834b4528892e277653febc93f4df0ee34f73 100755 (executable)
--- a/contrib/package/luci-addons/dist/sbin/luci-flash
+++ b/contrib/package/luci-addons/dist/sbin/luci-flash
@@ -85,5 +85,9 @@ done
 [ -n "$sysupgrade_init_conffiles" ] && do_save_conffiles
 run_hooks "" $sysupgrade_pre_upgrade
 
+ask_bool() {
+       false
+}
+
 v "Switching to ramdisk..."
 run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index bbe202d9d33437fbb81b9c6ab26818f5ce2f56be..b72b3a789f881c9aa2f5e07e5dcec3e92e150709 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -214,6 +214,7 @@ function action_upgrade()
        end
 
        luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
+       luci.sys.reboot()
 end
 
 function _keep_pattern()
@@ -226,4 +227,4 @@ function _keep_pattern()
                end
        end
        return kpattern
-end
\ No newline at end of file
+end

diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 265443bd32025a320ab63c4f83c9e760b025d900..149cd588dee5c7e02cc5c20fe899b7fea594ea00 100644 (file)
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -111,6 +111,7 @@ function action_upgrade()
        end
 
        luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
+       luci.sys.reboot()
 end
 
 function _keep_pattern()
@@ -123,4 +124,4 @@ function _keep_pattern()
                end
        end
        return kpattern
-end
\ No newline at end of file
+end