diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-11-19 16:50:25 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-11-19 16:50:25 +0000 |
| commit | d46e17548bca2a3557ff598b29f993bfca8474b8 (patch) | |
| tree | e688842489802f16dd61365fdb7443286f8b0fcc /package | |
| parent | 0838e883f23dccd17ce752b698ac26c2a625e4e4 (diff) | |
| download | upstream-d46e17548bca2a3557ff598b29f993bfca8474b8.tar.gz upstream-d46e17548bca2a3557ff598b29f993bfca8474b8.tar.bz2 upstream-d46e17548bca2a3557ff598b29f993bfca8474b8.zip | |
base-files: kill remaining processes after running user hooks (#10461)
SVN-Revision: 29256
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 4 |
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' |