ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-31 00:24:12 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

base-files: change logging for upgrade on stage2

Browse Source 
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>
This commit is contained in:
Florian Eckert 2021-02-02 11:26:28 +01:00 committed by Paul Spooren
parent bb2b7156a4
commit 42d78fedfb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/base-files/files/lib/upgrade/stage2
View File

@ -85,7 +85,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
local stat local stat
local proc_ppid=$(cut -d' ' -f4 /proc/$$/stat) local proc_ppid=$(cut -d' ' -f4 /proc/$$/stat)
vn "Sending $sig to remaining processes ..." v "Sending $sig to remaining processes ..."
while $run; do while $run; do
run=false run=false
@ -105,7 +105,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
# Skip kernel threads # Skip kernel threads
[ -n "$cmdline" ] || continue [ -n "$cmdline" ] || continue
_vn " $name" v "Sending signal $sig to $name ($pid)"
kill -$sig $pid 2>/dev/null kill -$sig $pid 2>/dev/null
[ $loop -eq 1 ] && run=true [ $loop -eq 1 ] && run=true
@ -113,12 +113,10 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
let loop_limit-- let loop_limit--
[ $loop_limit -eq 0 ] && { [ $loop_limit -eq 0 ] && {
_v
v "Failed to kill all processes." v "Failed to kill all processes."
exit 1 exit 1
} }
done done
_v
} }
indicate_upgrade indicate_upgrade