Jelajahi Sumber

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 <[email protected]>
Florian Eckert 5 tahun lalu
induk
melakukan
42d78fedfb
1 mengubah file dengan 2 tambahan dan 4 penghapusan
  1. 2 4
      package/base-files/files/lib/upgrade/stage2

+ 2 - 4
package/base-files/files/lib/upgrade/stage2

@@ -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