Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of Tomasz Maciej Nowak > Sent: Mittwoch, 25. November 2020 17:34 > To: openwrt-devel@lists.openwrt.org > Subject: [PATCH 2/8] mvebu: sysupgrade: use v function for writing logs > > Signed-off-by: Tomasz Maciej Nowak <tmn...@gmail.com>
would you please add a commit message for this one and resend it?
You may just send this one without the rest of the patches, I will pick it
then. (Just going through the rest at the moment, will probably take most/all
of it as well.)
Or, if you prefer, just send the commit message as an answer to this mail and I
will insert it.
Best
Adrian
> ---
> target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 12 ++++++------
> .../mvebu/cortexa9/base-files/lib/upgrade/linksys.sh | 2 +-
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
> b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
> index d16ddc500079..f189c240cf09 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 magic 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 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 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 6ccfdd0768da..c5da471d76f1 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
>
> --
> 2.29.2
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
openpgp-digital-signature.asc
Description: PGP signature
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
