From 4a078bd1354eaa2bba109d411218820e03b2e1de Mon Sep 17 00:00:00 2001 From: Oskari Lemmela Date: Tue, 2 Mar 2021 21:42:07 +0200 Subject: firmware-utils/ptgen: fix partition guid and name guid and name function should be called before storing partition info. Signed-off-by: Oskari Lemmela --- tools/firmware-utils/src/ptgen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c index a55f2e7a14..d50c12b714 100644 --- a/tools/firmware-utils/src/ptgen.c +++ b/tools/firmware-utils/src/ptgen.c @@ -529,7 +529,8 @@ static guid_t type_to_guid_and_name(unsigned char type, char **name) switch (type) { case 0xef: - *name = "EFI System Partition"; + if(*name == NULL) + *name = "EFI System Partition"; guid = GUID_PARTITION_SYSTEM; break; case 0x83: @@ -586,6 +587,7 @@ int main (int argc, char **argv) *(p++) = 0; parts[part].start = to_kbytes(p); } + part_guid = type_to_guid_and_name(type, &name); parts[part].size = to_kbytes(optarg); parts[part].required = required; parts[part].name = name; @@ -598,7 +600,6 @@ int main (int argc, char **argv) */ name = NULL; required = 0; - part_guid = type_to_guid_and_name(type, &name); break; case 'N': name = optarg; -- cgit v1.2.3