[PATCH] fixup! blspec: factor out generic parts into bootscan helper

[PATCH] fixup! blspec: factor out generic parts into bootscan helper

[Ahmad Fatoum]

From: Ahmad Fatoum <a.fatoum@barebox.org>

blspec: fix detection of XBOOTLDR partitions

XBOOTLDR partitions are identified by a specific partition type or type
UUID, but this got broken during the rework to use bootscan, because we
are now iterating over partitions (partcdev) instead of all cdevs
beneath a device (cdev).

Fix this.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/blspec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/blspec.c b/common/blspec.c
index 373ad99a632c..5223ac30f8a5 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -510,8 +510,8 @@ static int blspec_scan_disk(struct bootscanner *scanner,
 		 * partition with the MBR type id of 0xEA already exists it
 		 * should be used as $BOOT
 		 */
-		if (cdev_is_mbr_partitioned(cdev->master) && cdev->dos_partition_type == 0xea) {
-			ret = boot_scan_cdev(scanner, bootentries, cdev);
+		if (cdev_is_mbr_partitioned(cdev) && partcdev->dos_partition_type == 0xea) {
+			ret = boot_scan_cdev(scanner, bootentries, partcdev);
 			if (ret == 0)
 				ret = -ENOENT;
 
-- 
2.39.5

Re: [PATCH] fixup! blspec: factor out generic parts into bootscan helper

[Sascha Hauer]

On Mon, 14 Apr 2025 08:22:52 +0200, Ahmad Fatoum wrote:
> blspec: fix detection of XBOOTLDR partitions
> 
> XBOOTLDR partitions are identified by a specific partition type or type
> UUID, but this got broken during the rework to use bootscan, because we
> are now iterating over partitions (partcdev) instead of all cdevs
> beneath a device (cdev).
> 
> [...]

Applied, thanks!

[1/1] fixup! blspec: factor out generic parts into bootscan helper
      https://git.pengutronix.de/cgit/barebox/commit/?id=9cd79ac9bca7 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>