[package] base-files: sysupgrade: kill all but essential processes before starting...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28626 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7e895f1..5afe3dc 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
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files

-PKG_RELEASE:=84
+PKG_RELEASE:=85

 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 65ce816..2126ca1 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -77,6 +77,30 @@ run_ramfs() { # <command> [...]
        exec /bin/busybox ash -c "$*"
 }
 
        exec /bin/busybox ash -c "$*"
 }
 

+kill_remaining() { # [ <signal> ]
+       local sig="${1:-TERM}"
+       echo -n "Sending $sig to remaing processes ... "
+       top -bn1 | while read pid ppid user stat vsz pvsz pcpu cmd args; do
+               case "$pid" in
+                       [0-9]*) : ;;
+                       *) continue ;;
+               esac
+               case "$cmd" in
+                       # Skip kernel threads and essential services
+                       \[*\]|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*) : ;;
+
+                       # Killable process
+                       *)
+                               if [ $pid -ne $$ ] && [ $ppid -ne $$ ]; then
+                                       echo -n "${cmd##*/} "
+                                       kill -$sig $pid 2>/dev/null
+                               fi
+                       ;;
+               esac
+       done
+       echo ""
+}
+

 run_hooks() {
        local arg="$1"; shift
        for func in "$@"; do
 run_hooks() {
        local arg="$1"; shift
        for func in "$@"; do

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 7efb2b4..d251cc9 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -127,6 +127,11 @@ elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
 else
        export SAVE_CONFIG=0
 fi
 else
        export SAVE_CONFIG=0
 fi

+
+kill_remaining TERM
+sleep 3
+kill_remaining KILL
+

 run_hooks "" $sysupgrade_pre_upgrade
 
 if [ -n "$(rootfs_type)" ]; then
 run_hooks "" $sysupgrade_pre_upgrade
 
 if [ -n "$(rootfs_type)" ]; then