[openwrt/openwrt] base-files: change logging for upgrade on stage2
LEDE Commits
lede-commits at lists.infradead.org
Sun Jun 20 18:16:18 PDT 2021
aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/42d78fedfb039b7ffd623c910cd946480c75bb26
commit 42d78fedfb039b7ffd623c910cd946480c75bb26
Author: Florian Eckert <fe at dev.tdt.de>
AuthorDate: Tue Feb 2 11:26:28 2021 +0100
base-files: change logging for upgrade on stage2
Remove vn call in favour of v call. This commit serves as preparation
for removing the vn function call.
Signed-off-by: Florian Eckert <fe at dev.tdt.de>
---
package/base-files/files/lib/upgrade/stage2 | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index ba728004e9..f2f3cd439a 100755
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -85,7 +85,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
local stat
local proc_ppid=$(cut -d' ' -f4 /proc/$$/stat)
- vn "Sending $sig to remaining processes ..."
+ v "Sending $sig to remaining processes ..."
while $run; do
run=false
@@ -105,7 +105,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
# Skip kernel threads
[ -n "$cmdline" ] || continue
- _vn " $name"
+ v "Sending signal $sig to $name ($pid)"
kill -$sig $pid 2>/dev/null
[ $loop -eq 1 ] && run=true
@@ -113,12 +113,10 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
let loop_limit--
[ $loop_limit -eq 0 ] && {
- _v
v "Failed to kill all processes."
exit 1
}
done
- _v
}
indicate_upgrade
More information about the lede-commits
mailing list