projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c80d0a3
)
Trigger post-flash reboot manually
author
Steven Barth
<steven@midlink.org>
Sat, 6 Sep 2008 18:55:26 +0000
(18:55 +0000)
committer
Steven Barth
<steven@midlink.org>
Sat, 6 Sep 2008 18:55:26 +0000
(18:55 +0000)
contrib/package/luci-addons/dist/sbin/luci-flash
patch
|
blob
|
history
modules/admin-full/luasrc/controller/admin/system.lua
patch
|
blob
|
history
modules/admin-mini/luasrc/controller/mini/system.lua
patch
|
blob
|
history
diff --git
a/contrib/package/luci-addons/dist/sbin/luci-flash
b/contrib/package/luci-addons/dist/sbin/luci-flash
index
07434b5
..
79bc834
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
[ -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'
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
bbe202d
..
b72b3a7
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})
end
luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
+ luci.sys.reboot()
end
function _keep_pattern()
end
function _keep_pattern()
@@
-226,4
+227,4
@@
function _keep_pattern()
end
end
return kpattern
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
265443b
..
149cd58
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})
end
luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
+ luci.sys.reboot()
end
function _keep_pattern()
end
function _keep_pattern()
@@
-123,4
+124,4
@@
function _keep_pattern()
end
end
return kpattern
end
end
return kpattern
-end
\ No newline at end of file
+end