aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-01-17 22:12:05 +0000
committerJohn Crispin <john@openwrt.org>2014-01-17 22:12:05 +0000
commitf18112883fbcea0a9e3cf7dd70531dc0a985aed0 (patch)
treeea974aa9de96d7c544eee0c8dab792334fa2ad67
parent63a43425686e5c74f57d742fd216d4bb9fd2144a (diff)
downloadupstream-f18112883fbcea0a9e3cf7dd70531dc0a985aed0.tar.gz
upstream-f18112883fbcea0a9e3cf7dd70531dc0a985aed0.tar.bz2
upstream-f18112883fbcea0a9e3cf7dd70531dc0a985aed0.zip
sysupgrade: do not kill any processes in failsafe
sysugrade killed the lock causing failsafe to stop Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 39318
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade8
2 files changed, 6 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 0160e41f88..d6c59384ee 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -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
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 56e9a92424..e6588bffcf 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -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..."