[openwrt/openwrt] x86: upgrade: make code comment appear as log lines

LEDE Commits lede-commits at lists.infradead.org
Wed Nov 11 10:47:11 EST 2020


yousong pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/c02096361c671351dc05733cdd47f3da71de47e7

commit c02096361c671351dc05733cdd47f3da71de47e7
Author: Yousong Zhou <yszhou4tech at gmail.com>
AuthorDate: Tue Nov 3 11:41:44 2020 +0800

    x86: upgrade: make code comment appear as log lines
    
    The comment content can be useful for readers of both the log and code
    
    Previously when dd command "records in/out" messages are not filtered
    like now with get_image_dd, it's not clear that these messages are for
    extracting boot sectors.  E.g.
    
    Before
    
      == upgrade: Reading partition table from bootdisk...
      37+26 records in
      37+26 records out
      == upgrade: Reading partition table from image...
    
    After
    
      == upgrade: Reading partition table from bootdisk...
      == upgrade: Extract boot sector from the image
      37+26 records in
      37+26 records out
      == upgrade: Reading partition table from image...
    
    Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
 target/linux/x86/base-files/lib/upgrade/platform.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index 0b54caea29..d8f2eba97e 100644
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -19,7 +19,7 @@ platform_check_image() {
 
 	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=63 bs=512b
 
 	get_partitions /tmp/image.bs image
@@ -82,7 +82,7 @@ platform_do_upgrade() {
 	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=63 bs=512b
 
 		get_partitions /tmp/image.bs image
@@ -114,7 +114,6 @@ platform_do_upgrade() {
 		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
 
@@ -129,5 +128,4 @@ platform_do_upgrade() {
 		sed -i "s/\(PARTUUID=\)[a-f0-9-]\+/\1$4$3$2$1-$6$5-$8$7-$9/ig" /mnt/boot/grub/grub.cfg
 		umount /mnt
 	fi
-
 }



More information about the lede-commits mailing list