From 1f0ac4101be71a954d16285163bebc85ad2f1d4d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 17 Jan 2014 22:12:05 +0000 Subject: sysupgrade: do not kill any processes in failsafe sysugrade killed the lock causing failsafe to stop Signed-off-by: Alexander Couzens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39318 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/sbin/sysupgrade | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'package/base-files/files/sbin') 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..." -- cgit v1.2.3