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>
This commit is contained in:
		
				
					committed by
					
						
						Adrian Schmutzler
					
				
			
			
				
	
			
			
			
						parent
						
							b9246bbdc9
						
					
				
				
					commit
					f06adb64bf
				
			@@ -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() {
 | 
					platform_check_image_sdcard() {
 | 
				
			||||||
	local file="$1"
 | 
						local file="$1"
 | 
				
			||||||
	local magic diskdev partdev diff
 | 
						local diskdev partdev diff
 | 
				
			||||||
 | 
					 | 
				
			||||||
	magic=$(get_magic_at "$file" 510)
 | 
					 | 
				
			||||||
	[ "$magic" != "55aa" ] && {
 | 
					 | 
				
			||||||
		echo "Failed to verify MBR boot signature."
 | 
					 | 
				
			||||||
		return 1
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	export_bootdevice && export_partdevice diskdev 0 || {
 | 
						export_bootdevice && export_partdevice diskdev 0 || {
 | 
				
			||||||
		echo "Unable to determine upgrade device"
 | 
							echo "Unable to determine upgrade device"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user