mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-06-20 15:48:26 +02:00
Code Releases 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 include $(INCLUDE_DIR)/version.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=149 PKG_RELEASE:=150
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host 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 ubus call system upgrade
touch /tmp/sysupgrade touch /tmp/sysupgrade
kill_remaining TERM if [ ! -f /tmp/failsafe ] ; then
sleep 3 kill_remaining TERM
kill_remaining KILL sleep 3
kill_remaining KILL
fi
if [ -n "$(rootfs_type)" ]; then if [ -n "$(rootfs_type)" ]; then
v "Switching to ramdisk..." v "Switching to ramdisk..."