diff options
| author | Steven Barth <steven@midlink.org> | 2008-09-06 19:39:03 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-09-06 19:39:03 +0000 |
| commit | 72927597bc3c5a5817225dcb20cfe406e1c1bac5 (patch) | |
| tree | def50b0d3dff8a2a471b4369617a38a958440454 | |
| parent | 087bd8afc7e29fa0b3f3e0b53c9a281bb53ca30f (diff) | |
Fixed stupid bug
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 b72b3a789..5d64336e0 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 569a0bbd2..a3d97d649 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 149cd588d..6d16ef865 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 569a0bbd2..a3d97d649 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 %> |