KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 28862
This commit is contained in:
Jo-Philipp Wich 2011-11-08 18:48:38 +00:00
parent a73fffe857
commit daca6a6a97
2 changed files with 2 additions and 2 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:=89 PKG_RELEASE:=90
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

2
package/base-files/files/lib/upgrade/common.sh
View file

@ -80,7 +80,7 @@ run_ramfs() { # <command> [...]
kill_remaining() { # [ <signal> ] kill_remaining() { # [ <signal> ]
local sig="${1:-TERM}" local sig="${1:-TERM}"
echo -n "Sending $sig to remaining processes ... " 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 case "$pid" in
[0-9]*) : ;; [0-9]*) : ;;
*) continue ;; *) continue ;;