aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-19 16:50:25 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-11-19 16:50:25 +0000
commit00a17bc44fb5dbd41ca7a0883bb739e79b146959 (patch)
tree1e00ffb3ad1fc3fbebea39d5810109f1b1baf812 /package
parent7edf0229435ce1d11bc8096c95e93373d7fda71f (diff)
downloadupstream-00a17bc44fb5dbd41ca7a0883bb739e79b146959.tar.gz
upstream-00a17bc44fb5dbd41ca7a0883bb739e79b146959.tar.bz2
upstream-00a17bc44fb5dbd41ca7a0883bb739e79b146959.zip
[package] base-files: kill remaining processes after running user hooks (#10461)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29256 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade4
2 files changed, 3 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9b3745ba98..b2d1d352a5 100644
--- 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 d251cc914f..cf79114cbb 100755
--- 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'