diff options
Diffstat (limited to 'modules')
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index b72b3a789f..5d64336e03 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -214,7 +214,6 @@ 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() diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm index 569a0bbd27..a3d97d6497 100644 --- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm @@ -48,4 +48,5 @@ $Id$ <% else %> <div class="error"><%:a_s_flash_notimplemented%></div> <% end %> -<%+footer%>
\ No newline at end of file +<%+footer%> +<% if ret == 0 then luci.sys.reboot() end %> diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua index 149cd588de..6d16ef8650 100644 --- a/modules/admin-mini/luasrc/controller/mini/system.lua +++ b/modules/admin-mini/luasrc/controller/mini/system.lua @@ -111,7 +111,6 @@ function action_upgrade() end luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail}) - luci.sys.reboot() end function _keep_pattern() diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm index 569a0bbd27..a3d97d6497 100644 --- a/modules/admin-mini/luasrc/view/mini/upgrade.htm +++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm @@ -48,4 +48,5 @@ $Id$ <% else %> <div class="error"><%:a_s_flash_notimplemented%></div> <% end %> -<%+footer%>
\ No newline at end of file +<%+footer%> +<% if ret == 0 then luci.sys.reboot() end %> |