From 42d78fedfb039b7ffd623c910cd946480c75bb26 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 2 Feb 2021 11:26:28 +0100 Subject: 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 --- 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() { # [ [ ] ] 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() { # [ [ ] ] # 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() { # [ [ ] ] let loop_limit-- [ $loop_limit -eq 0 ] && { - _v v "Failed to kill all processes." exit 1 } done - _v } indicate_upgrade -- cgit v1.2.3