mvebu: sysupgrade: use v function for writing logs
authorTomasz Maciej Nowak <tmn505@gmail.com>
Tue, 1 Dec 2020 17:29:16 +0000 (18:29 +0100)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Tue, 1 Dec 2020 18:38:43 +0000 (19:38 +0100)
Sync with x86 target changes.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh

index ed332bf3e3ec522b5d601c2b5446316c47742e06..0f95b1b65971bc3803cfa2bf6f9cb531e9060418 100644 (file)
@@ -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
 
index 6ccfdd0768dad54366c682c9be24a188fbea75df..c5da471d76f1515da409c5e9c6db1e6dd91075b6 100644 (file)
@@ -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