From: Tomasz Maciej Nowak <tmn505@gmail.com>
Date: Tue, 1 Dec 2020 17:29:16 +0000 (+0100)
Subject: mvebu: sysupgrade: use v function for writing logs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b5036569aa1839a75a365e694b1fe2f9cb1983e8;p=openwrt%2Fstaging%2Fnbd.git

mvebu: sysupgrade: use v function for writing logs

Sync with x86 target changes.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
---

diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
index ed332bf3e3..0f95b1b659 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
@@ -3,7 +3,7 @@ platform_check_image_sdcard() {
 	local diskdev partdev diff
 
 	export_bootdevice && export_partdevice diskdev 0 || {
-		echo "Unable to determine upgrade device"
+		v "Unable to determine upgrade device"
 	return 1
 	}
 
@@ -20,7 +20,7 @@ platform_check_image_sdcard() {
 	rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
 
 	if [ -n "$diff" ]; then
-		echo "Partition layout has changed. Full image will be written."
+		v "Partition layout has changed. Full image will be written."
 		ask_bool 0 "Abort" && exit 1
 		return 0
 	fi
@@ -31,7 +31,7 @@ platform_do_upgrade_sdcard() {
 	local diskdev partdev diff
 
 	export_bootdevice && export_partdevice diskdev 0 || {
-		echo "Unable to determine upgrade device"
+		v "Unable to determine upgrade device"
 	return 1
 	}
 
@@ -64,15 +64,15 @@ platform_do_upgrade_sdcard() {
 		#iterate over each partition from the image and write it to the boot disk
 		while read part start size; do
 			if export_partdevice partdev $part; then
-				echo "Writing image to /dev/$partdev..."
+				v "Writing image to /dev/$partdev..."
 				get_image_dd "$1" of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
 			else
-				echo "Unable to find partition $part device, skipped."
+				v "Unable to find partition $part device, skipped."
 			fi
 		done < /tmp/partmap.image
 
 		#copy partition uuid
-		echo "Writing new UUID to /dev/$diskdev..."
+		v "Writing new UUID to /dev/$diskdev..."
 		get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
 	fi
 
diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
index 6ccfdd0768..c5da471d76 100644
--- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
@@ -57,7 +57,7 @@ platform_do_upgrade_linksys() {
 
 	if [ ! -n "$part_label" ]
 	then
-		echo "cannot find target partition"
+		v "cannot find target partition"
 		exit 1
 	fi