From 0c1b81f869a6fdf8778a7d16b13ea9bfe3583849 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 8 Nov 2011 18:48:38 +0000 Subject: [package] base-files: do not assume that "top" is busybox' top, but try to call the applet explicitely git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28862 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/Makefile | 2 +- package/base-files/files/lib/upgrade/common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'package/base-files') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 2b1cfa13b..e29e63b3d 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 e0db37e75..a5a6fbf7e 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() { # [...] kill_remaining() { # [ ] 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 ;; -- cgit v1.2.3