From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 8 Nov 2011 18:48:38 +0000 (+0000)
Subject: base-files: do not assume that "top" is busybox' top, but try to call the applet... 
X-Git-Tag: reboot~15607
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=daca6a6a97f89214b6fbfccf7989b4c17bde3da6;p=oweals%2Fopenwrt.git

base-files: do not assume that "top" is busybox' top, but try to call the applet explicitely

SVN-Revision: 28862
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 2b1cfa13b3..e29e63b3d9 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:=89
+PKG_RELEASE:=90
 
 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 e0db37e750..a5a6fbf7e5 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -80,7 +80,7 @@ run_ramfs() { # <command> [...]
 kill_remaining() { # [ <signal> ]
 	local sig="${1:-TERM}"
 	echo -n "Sending $sig to remaining processes ... "
-	top -bn1 | while read pid ppid user stat vsz pvsz pcpu cmd args; do
+	/bin/busybox top -bn1 2>/dev/null | while read pid ppid user stat vsz pvsz pcpu cmd args; do
 		case "$pid" in
 			[0-9]*) : ;;
 			*) continue ;;