hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
master
Jo-Philipp Wich 2011-11-19 16:50:25 +00:00
parent 7edf022943
commit 00a17bc44f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

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

4
package/base-files/files/sbin/sysupgrade
View File

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