aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOskari Lemmela <oskari@lemmela.net>2021-03-02 21:42:07 +0200
committerDaniel Golle <daniel@makrotopia.org>2021-03-03 01:00:23 +0000
commit4a078bd1354eaa2bba109d411218820e03b2e1de (patch)
tree1bad02da7c6b27f57e2abc0b2aad08048930409b
parent46c411e0b30a6f581c0c25f7a03385eb49effd03 (diff)
downloadupstream-4a078bd1354eaa2bba109d411218820e03b2e1de.tar.gz
upstream-4a078bd1354eaa2bba109d411218820e03b2e1de.tar.bz2
upstream-4a078bd1354eaa2bba109d411218820e03b2e1de.zip
firmware-utils/ptgen: fix partition guid and name
guid and name function should be called before storing partition info. Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
-rw-r--r--tools/firmware-utils/src/ptgen.c5
1 files 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;