projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] base-files: do not assume that "top" is busybox' top, but try to call the...
[openwrt.git]
/
package
/
base-files
/
files
/
lib
/
upgrade
/
common.sh
diff --git
a/package/base-files/files/lib/upgrade/common.sh
b/package/base-files/files/lib/upgrade/common.sh
index
a2c0dba
..
a5a6fbf
100644
(file)
--- a/
package/base-files/files/lib/upgrade/common.sh
+++ b/
package/base-files/files/lib/upgrade/common.sh
@@
-80,14
+80,14
@@
run_ramfs() { # <command> [...]
kill_remaining() { # [ <signal> ]
local sig="${1:-TERM}"
echo -n "Sending $sig to remaining processes ... "
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 ;;
esac
case "$cmd" in
# Skip kernel threads and essential services
case "$pid" in
[0-9]*) : ;;
*) continue ;;
esac
case "$cmd" in
# Skip kernel threads and essential services
- \[*\]|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*) : ;;
+ \[*\]|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*
|*ubusd*|*netifd*|*hostapd*|*wpa_supplicant*
) : ;;
# Killable process
*)
# Killable process
*)
This page took
0.020499 seconds
and
4
git commands to generate.