Bladeren bron

base-files: kill remaining processes after running user hooks (#10461)

SVN-Revision: 29256
Jo-Philipp Wich 14 jaren geleden
bovenliggende
commit
d46e17548b
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 1 1
      package/base-files/Makefile
  2. 2 2
      package/base-files/files/sbin/sysupgrade

+ 1 - 1
package/base-files/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=97
+PKG_RELEASE:=98
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

+ 2 - 2
package/base-files/files/sbin/sysupgrade

@@ -128,12 +128,12 @@ else
 	export SAVE_CONFIG=0
 fi
 
+run_hooks "" $sysupgrade_pre_upgrade
+
 kill_remaining TERM
 sleep 3
 kill_remaining KILL
 
-run_hooks "" $sysupgrade_pre_upgrade
-
 if [ -n "$(rootfs_type)" ]; then
 	v "Switching to ramdisk..."
 	run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'