KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sysupgrade: do not kill any processes in failsafe

Browse source 
sysugrade killed the lock causing failsafe to stop

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

SVN-Revision: 39318
This commit is contained in:
John Crispin 2014-01-17 22:12:05 +00:00
parent 63a4342568
commit f18112883f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/Makefile
View file

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/version.mk
PKG_NAME:=base-files
PKG_RELEASE:=149
PKG_RELEASE:=150
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host

8
package/base-files/files/sbin/sysupgrade
View file

@ -210,9 +210,11 @@ run_hooks "" $sysupgrade_pre_upgrade
ubus call system upgrade
touch /tmp/sysupgrade
kill_remaining TERM
sleep 3
kill_remaining KILL
if [ ! -f /tmp/failsafe ] ; then
kill_remaining TERM
sleep 3
kill_remaining KILL
fi
if [ -n "$(rootfs_type)" ]; then
v "Switching to ramdisk..."