[openwrt/openwrt] mvebu: sysupgrade: write additional information to log output

LEDE Commits lede-commits at lists.infradead.org
Tue Dec 1 15:07:24 EST 2020


adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/1ac3b53278f77049008ce0e5dcc18d87ef6b9f70

commit 1ac3b53278f77049008ce0e5dcc18d87ef6b9f70
Author: Tomasz Maciej Nowak <tmn505 at gmail.com>
AuthorDate: Tue Dec 1 18:29:17 2020 +0100

    mvebu: sysupgrade: write additional information to log output
    
    This will explain what is actually occuring on dd invocations.
    Additionally remove comments for steps which are described by printed
    statements anyway.
    
    Signed-off-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
---
 target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
index 0f95b1b659..caa726b4d5 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
@@ -9,7 +9,7 @@ platform_check_image_sdcard() {
 
 	get_partitions "/dev/$diskdev" bootdisk
 
-	#extract the boot sector from the image
+	v "Extract boot sector from the image"
 	get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
 
 	get_partitions /tmp/image.bs image
@@ -40,7 +40,7 @@ platform_do_upgrade_sdcard() {
 	if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
 		get_partitions "/dev/$diskdev" bootdisk
 
-		#extract the boot sector from the image
+		v "Extract boot sector from the image"
 		get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b
 
 		get_partitions /tmp/image.bs image
@@ -59,7 +59,7 @@ platform_do_upgrade_sdcard() {
 		partx -d - "/dev/$diskdev"
 		partx -a - "/dev/$diskdev"
 	else
-		#write uboot image
+		v "Writing bootloader to /dev/$diskdev"
 		get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=2048 conv=fsync
 		#iterate over each partition from the image and write it to the boot disk
 		while read part start size; do
@@ -71,7 +71,6 @@ platform_do_upgrade_sdcard() {
 			fi
 		done < /tmp/partmap.image
 
-		#copy partition uuid
 		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



More information about the lede-commits mailing list