From: Daniel Golle <redacted>
Date: Mon, 14 Feb 2022 14:24:21 +0000 (+0000)
Subject: auc: fall back to 'sdcard' image
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6b041752a00d125a4e651aa56f6abae0e06a59b6;p=openwrt-packages.git

auc: fall back to 'sdcard' image

Fallback to use 'sdcard' image in case there is neither 'sysupgrade'
nor 'combined' image available.
This allows using 'auc' on targets where 'sdcard' image is also used
for sysupgrade (such as some mvebu-based devices with eMMC).

Signed-off-by: Daniel Golle <redacted>
---

diff --git a/utils/auc/src/auc.c b/utils/auc/src/auc.c
index 6a78d2db8..cd2acc522 100644
--- a/utils/auc/src/auc.c
+++ b/utils/auc/src/auc.c
@@ -1363,6 +1363,10 @@ static int select_image(struct blob_attr *images, const char *target_fstype, cha
 		ret = get_image_by_type(images, combined_type, fstype, image_name, image_sha256);
 		if (!ret)
 			return 0;
+
+		ret = get_image_by_type(images, "sdcard", fstype, image_name, image_sha256);
+		if (!ret)
+			return 0;
 	}
 
 	/* fallback to squashfs unless fstype requested explicitly */
@@ -1372,6 +1376,10 @@ static int select_image(struct blob_attr *images, const char *target_fstype, cha
 			return 0;
 
 		ret = get_image_by_type(images, combined_type, "squashfs", image_name, image_sha256);
+		if (!ret)
+			return 0;
+
+		ret = get_image_by_type(images, "sdcard", fstype, image_name, image_sha256);
 	}
 
 	return ret;