summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2016-03-17 15:55:02 +0100
committerJo-Philipp Wich <jow@openwrt.org>2016-03-17 15:55:23 +0100
commit362db10f882fc448f550e1f0de1afeb27ab3156f (patch)
treeb28cd48952974114746524cc950c120057d4c0de
parent516689a646351ab86dd126bd0a69851c77733e96 (diff)
luci-mod-admin-full: add sleep before sysupgrade
- Under some conditions the system will shutdown uhttpd before the page will be delivered to the client. Waiting one second should eleminate this behaviour. Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com> Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
-rw-r--r--modules/luci-mod-admin-full/luasrc/controller/admin/system.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
index cbba48cc25..d180da71b7 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
@@ -290,7 +290,7 @@ function action_sysupgrade()
msg = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
addr = (#keep > 0) and "192.168.1.1" or nil
})
- fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
+ fork_exec("sleep 1; killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
end
end