aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-10-27 16:52:31 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-10-27 16:52:31 +0000
commit52e93e54bca8aecf3846b8924e7ae15e497cdc2a (patch)
treef7898d622351d54ce26b26210a1ff6bde6822661
parent825658977f19c135acadc1ae741e376f796446a5 (diff)
downloadupstream-52e93e54bca8aecf3846b8924e7ae15e497cdc2a.tar.gz
upstream-52e93e54bca8aecf3846b8924e7ae15e497cdc2a.tar.bz2
upstream-52e93e54bca8aecf3846b8924e7ae15e497cdc2a.zip
base-files: sysupgrade: kill all but essential processes before starting the update
SVN-Revision: 28626
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/files/lib/upgrade/common.sh24
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade5
3 files changed, 30 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7e895f1d31..5afe3dc6ef 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:=84
+PKG_RELEASE:=85
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 65ce816db2..2126ca1c38 100644
--- 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 "$*"
}
+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
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 7efb2b4365..d251cc914f 100755
--- 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
+
+kill_remaining TERM
+sleep 3
+kill_remaining KILL
+
run_hooks "" $sysupgrade_pre_upgrade
if [ -n "$(rootfs_type)" ]; then