X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fsysupgrade-atheros%2Ffiles%2Flib%2Fupgrade%2Fplatform.sh;h=ac7e62e103e7928050b54f6fd5db075895c79323;hp=87a324810432ca9f45fdefcb3a5478c8c1ad4227;hb=8c675f6a6ccd30c79fbc2d624b9ce2e6d7375d66;hpb=94322a831539b23fbf0433bf2fe2bbe92c3122da

diff --git a/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh b/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh
index 87a324810..ac7e62e10 100644
--- a/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh
+++ b/contrib/package/sysupgrade-atheros/files/lib/upgrade/platform.sh
@@ -3,9 +3,19 @@ platform_check_image() {
 
 	case "$(get_magic_word "$1")" in
 		# Freifunk .img files
-		4646) return 0;;
+		4646)
+			local kern_name=$(dd if="$1" bs=2 skip=5 count=8 2>/dev/null); kern_name="${kern_name%% *}"
+			local root_name=$(dd if="$1" bs=2 skip=17 count=8 2>/dev/null); root_name="${root_name%% *}"
+
+			if grep -q '"'$kern_name'"' /proc/mtd && grep -q '"'$root_name'"' /proc/mtd; then
+				return 0
+			else
+				echo "Invalid image. Missing the '$kern_name' or '$root_name' partition"
+				return 1
+			fi
+		;;
 		*)
-			echo "Invalid image. Use Freifunk .img files on this platform"
+			echo "Invalid image. Use combined .img files on this platform"
 			return 1
 		;;
 	esac
@@ -17,16 +27,18 @@ platform_do_upgrade() {
 	local root_length=$((0x$(dd if="$1" bs=2 skip=13 count=4 2>/dev/null)/65536))
 	local root_name=$(dd if="$1" bs=2 skip=17 count=8 2>/dev/null); root_name="${root_name%% *}"
 
-	local append=""
-	[ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+	if grep -q '"'$kern_name'"' /proc/mtd && grep -q '"'$root_name'"' /proc/mtd; then
+		local append=""
+		[ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
 
-	if [ -n "$kern_name" -a -n "$root_name" ] && \
-	   [ ${kern_length:-0} -gt 0 -a ${root_length:-0} -gt ${kern_length:-0} ];
-	then
-		dd if="$1" bs=65536 skip=1 count=$kern_length 2>/dev/null | \
-			mtd -e $kern_name write - $kern_name
+		if [ -n "$kern_name" -a -n "$root_name" ] && \
+		   [ ${kern_length:-0} -gt 0 -a ${root_length:-0} -gt ${kern_length:-0} ];
+		then
+			dd if="$1" bs=65536 skip=1 count=$kern_length 2>/dev/null | \
+				mtd -e $kern_name write - $kern_name
 
-		dd if="$1" bs=65536 skip=$((1+$kern_length)) count=$root_length 2>/dev/null | \
-			mtd -e $root_name $append write - $root_name
+			dd if="$1" bs=65536 skip=$((1+$kern_length)) count=$root_length 2>/dev/null | \
+				mtd -e $root_name $append write - $root_name
+		fi
 	fi
 }