Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Trigger post-flash reboot manually

Browse source
This commit is contained in:
Steven Barth 2008-09-06 18:55:26 +00:00
parent c80d0a350e
commit 087bd8afc7
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/package/luci-addons/dist/sbin/luci-flash vendored
View file

@ -85,5 +85,9 @@ done
[ -n "$sysupgrade_init_conffiles" ] && do_save_conffiles [ -n "$sysupgrade_init_conffiles" ] && do_save_conffiles
run_hooks "" $sysupgrade_pre_upgrade run_hooks "" $sysupgrade_pre_upgrade
ask_bool() {
false
}
v "Switching to ramdisk..." v "Switching to ramdisk..."
run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade' run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'

3
modules/admin-full/luasrc/controller/admin/system.lua
View file

@ -214,6 +214,7 @@ function action_upgrade()
end end
luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail}) luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
luci.sys.reboot()
end end
function _keep_pattern() function _keep_pattern()
@ -226,4 +227,4 @@ function _keep_pattern()
end end
end end
return kpattern return kpattern
end end

3
modules/admin-mini/luasrc/controller/mini/system.lua
View file

@ -111,6 +111,7 @@ function action_upgrade()
end end
luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail}) luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
luci.sys.reboot()
end end
function _keep_pattern() function _keep_pattern()
@ -123,4 +124,4 @@ function _keep_pattern()
end end
end end
return kpattern return kpattern
end end