[PATCH] fix partuuid format

[PATCH] fix partuuid format

[Oliver ROHE]

root=PARTUUID=SSSSSSSS-PP

Where SSSSSSSS is a zero-filled 32-bit MBR disk signature,
and PP is a zero-filled partition number in hexadecimal format.

Signed-off-by: Oliver Rohe <oliver.rohe@wago.com>

diff --git a/common/partitions/dos.c b/common/partitions/dos.c
index 95b71af7ff8..6204fdabc81 100644
--- a/common/partitions/dos.c
+++ b/common/partitions/dos.c
@@ -172,7 +172,7 @@ static void dos_extended_partition(struct block_device *blk, struct dos_partitio
                pentry->size = get_unaligned_le32(&table[0].partition_size);
                pentry->dos_partition_type = table[0].type;
                pentry->num = partno;
-               sprintf(pentry->partuuid, "%08x-%02u", signature, partno + 1);
+               sprintf(pentry->partuuid, "%08x-%02x", signature, partno + 1);

                list_add_tail(&pentry->list, &dpd->pd.partitions);

@@ -270,7 +270,7 @@ static struct partition_desc *dos_partition(void *buf, struct block_device *blk)
                extract_flags(&table[i], pentry);
                pentry->num = i;

-               sprintf(pentry->partuuid, "%08x-%02d", signature, i + 1);
+               sprintf(pentry->partuuid, "%08x-%02x", signature, i + 1);
                dpd->signature = signature;

                if (is_extended_partition(pentry)) {
diff --git a/scripts/kernel-install.c b/scripts/kernel-install.c
index 240122f2d22..05e464d114c 100644
--- a/scripts/kernel-install.c
+++ b/scripts/kernel-install.c
@@ -1370,7 +1370,7 @@ int main(int argc, char *argv[])
                        goto out;
                }

-               append_option("root=PARTUUID=%08X-%02d", nt_disk_signature, root_partition_num);
+               append_option("root=PARTUUID=%08X-%02X", nt_disk_signature, root_partition_num);
        }

        if (list) {
--
2.25.1

Internal

Re: [PATCH] fix partuuid format

[Sascha Hauer]

On Wed, 26 Feb 2025 14:29:48 +0000, Oliver ROHE wrote:
> root=PARTUUID=SSSSSSSS-PP
> 
> Where SSSSSSSS is a zero-filled 32-bit MBR disk signature,
> and PP is a zero-filled partition number in hexadecimal format.
> 
> 

Applied, thanks!

[1/1] fix partuuid format
      https://git.pengutronix.de/cgit/barebox/commit/?id=faa88fc2d97b (link may not be stable)

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

Re: [PATCH] fix partuuid format

[Sascha Hauer]

Hi Oliver,

On Wed, Feb 26, 2025 at 02:29:48PM +0000, Oliver ROHE wrote:
> root=PARTUUID=SSSSSSSS-PP
> 
> Where SSSSSSSS is a zero-filled 32-bit MBR disk signature,
> and PP is a zero-filled partition number in hexadecimal format.

Thanks for fixing this. This doesn't seem to be documented in Linux, so
I digged in the code and added this to the commit message:

| This is not explicitly documented in Linux, but can be seen in [1].
| 
| [1] https://github.com/torvalds/linux/blob/76544811c850a1f4c055aa182b513b7a843868ea/block/partitions/msdos.c#L108

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |