diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2021-02-02 11:26:28 +0100 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2021-06-20 15:15:32 -1000 |
| commit | 42d78fedfb039b7ffd623c910cd946480c75bb26 (patch) | |
| tree | 93466787f99e51bd722bba2d106e4fef681b8a6c | |
| parent | bb2b7156a4b55a5599ac45adbe46b2d6bd046036 (diff) | |
| download | openwrt-42d78fedfb039b7ffd623c910cd946480c75bb26.tar.gz openwrt-42d78fedfb039b7ffd623c910cd946480c75bb26.tar.bz2 openwrt-42d78fedfb039b7ffd623c910cd946480c75bb26.zip | |
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@dev.tdt.de>
| -rwxr-xr-x | package/base-files/files/lib/upgrade/stage2 | 6 |
1 files 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 |