diff mbox series

[v2,06/10] base-files: upgrade: stage2: rework log lines

Message ID 20201110022223.41175-7-yszhou4tech@gmail.com
State Superseded, archived
Delegated to: Yousong Zhou
Headers show
Series sysupgrade: reword and organize log lines | expand

Commit Message

Yousong Zhou Nov. 10, 2020, 2:22 a.m. UTC
- Use common v function when possible
 - Write log lines to stderr when using echo

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
 package/base-files/files/lib/upgrade/stage2 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index 211a3f4b33..f2db08c3be 100755
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -53,7 +53,7 @@  switch_to_ramfs() {
 	[ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
 
 	supivot $RAM_ROOT /mnt || {
-		echo "Failed to switch over to ramfs. Please reboot."
+		v "Failed to switch over to ramfs. Please reboot."
 		exit 1
 	}
 
@@ -75,7 +75,7 @@  kill_remaining() { # [ <signal> [ <loop> ] ]
 	local stat
 	local proc_ppid=$(cut -d' ' -f4  /proc/$$/stat)
 
-	echo -n "Sending $sig to remaining processes ... "
+	echo -n "Sending $sig to remaining processes ... " >&2
 
 	while $run; do
 		run=false
@@ -95,7 +95,7 @@  kill_remaining() { # [ <signal> [ <loop> ] ]
 			# Skip kernel threads
 			[ -n "$cmdline" ] || continue
 
-			echo -n "$name "
+			echo -n "$name " >&2
 			kill -$sig $pid 2>/dev/null
 
 			[ $loop -eq 1 ] && run=true
@@ -104,7 +104,7 @@  kill_remaining() { # [ <signal> [ <loop> ] ]
 		let loop_limit--
 		[ $loop_limit -eq 0 ] && {
 			echo
-			echo "Failed to kill all processes."
+			v "Failed to kill all processes."
 			exit 1
 		}
 	done
@@ -129,7 +129,7 @@  if [ -n "$IMAGE" ] && type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
 fi
 
 if [ -n "$(rootfs_type)" ]; then
-	echo "Switching to ramdisk..."
+	v "Switching to ramdisk..."
 	switch_to_ramfs
 fi