From: Tomasz Maciej Nowak <tmn505@gmail.com>
Date: Wed, 25 Nov 2020 16:33:34 +0000 (+0100)
Subject: mvebu: sysupgrade: remove redundant MBR check
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f06adb64bfb1650f16bbd9c894ca47c250df5976;p=openwrt%2Fstaging%2Faparcar.git

mvebu: sysupgrade: remove redundant MBR check

This is already done by get_partitions.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
[add "redundant" to title, remove declaration of magic variable]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

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"