base-files: change logging for upgrade on stage2

[openwrt/openwrt.git] / package / base-files / files / lib / upgrade / stage2

diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index ba728004e9ebd536219cf5610d5c27c339f32314..f2f3cd439a747e80da9f7c22d75325983eb9868b 100755 (executable)
--- 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