[package] base-files: kill remaining processes after running user hooks (#10461)
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 19 Nov 2011 16:50:25 +0000 (16:50 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 19 Nov 2011 16:50:25 +0000 (16:50 +0000)
SVN-Revision: 29256

package/base-files/Makefile
package/base-files/files/sbin/sysupgrade

index 9b3745b..b2d1d35 100644 (file)
@@ -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
index d251cc9..cf79114 100755 (executable)
@@ -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'