Просмотр исходного кода

sysupgrade: do not kill any processes in failsafe

sysugrade killed the lock causing failsafe to stop

Signed-off-by: Alexander Couzens <[email protected]>

SVN-Revision: 39318
John Crispin 12 лет назад
Родитель
Сommit
f18112883f
2 измененных файлов с 6 добавлено и 4 удалено
  1. 1 1
      package/base-files/Makefile
  2. 5 3
      package/base-files/files/sbin/sysupgrade

+ 1 - 1
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

+ 5 - 3
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..."