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

SVN-Revision: 29256

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9b3745ba98c0435ea375322423ddd9db1aee3bf7..b2d1d352a5bb5d59dad59e15b2b76130a35d3c0a 100644 (file)
--- a/package/base-files/Makefile
+++ b/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

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index d251cc914f9210f76864ca7273837b7fa99c13b4..cf79114cbb2802f45740ff78ddb62a78add7f163 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/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'