diff options
| -rwxr-xr-x | contrib/package/luci-addons/dist/sbin/luci-flash | 4 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/system.lua | 3 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/controller/mini/system.lua | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/contrib/package/luci-addons/dist/sbin/luci-flash b/contrib/package/luci-addons/dist/sbin/luci-flash index 07434b5073..79bc834b45 100755 --- 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 bbe202d9d3..b72b3a789f 100644 --- 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 265443bd32..149cd588de 100644 --- 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 |