[openwrt/openwrt] mvebu: sysupgrade: remove redundant MBR check

LEDE Commits lede-commits at lists.infradead.org
Wed Nov 25 12:53:19 EST 2020


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

commit f06adb64bfb1650f16bbd9c894ca47c250df5976
Author: Tomasz Maciej Nowak <tmn505 at gmail.com>
AuthorDate: Wed Nov 25 17:33:34 2020 +0100

    mvebu: sysupgrade: remove redundant MBR check
    
    This is already done by get_partitions.
    
    Signed-off-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
    [add "redundant" to title, remove declaration of magic variable]
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
index 184803a50f..3dbd1e2578 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
@@ -1,18 +1,6 @@
-get_magic_at() {
-	local file="$1"
-	local pos="$2"
-	get_image "$file" | dd bs=1 count=2 skip="$pos" 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
-}
-
 platform_check_image_sdcard() {
 	local file="$1"
-	local magic diskdev partdev diff
-
-	magic=$(get_magic_at "$file" 510)
-	[ "$magic" != "55aa" ] && {
-		echo "Failed to verify MBR boot signature."
-		return 1
-	}
+	local diskdev partdev diff
 
 	export_bootdevice && export_partdevice diskdev 0 || {
 		echo "Unable to determine upgrade device"



More information about the lede-commits mailing list