You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.5 KiB
45 lines
1.5 KiB
From a95f7a89ed81fb3d7c3135baae20b056b7f8e661 Mon Sep 17 00:00:00 2001 |
|
From: Karel Zak <kzak@redhat.com> |
|
Date: Wed, 10 May 2017 15:26:55 +0200 |
|
Subject: [PATCH] libfdisk: (gpt) fix UUID printing |
|
|
|
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1344726 |
|
Signed-off-by: Karel Zak <kzak@redhat.com> |
|
--- |
|
libfdisk/src/gpt.c | 14 +++----------- |
|
1 file changed, 3 insertions(+), 11 deletions(-) |
|
|
|
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c |
|
index 899e1b2..612ce09 100644 |
|
--- a/libfdisk/src/gpt.c |
|
+++ b/libfdisk/src/gpt.c |
|
@@ -1690,7 +1690,7 @@ static int gpt_create_disklabel(struct fdisk_context *cxt) |
|
{ |
|
int rc = 0; |
|
ssize_t esz = 0; |
|
- struct gpt_guid *uid; |
|
+ char str[37]; |
|
struct fdisk_gpt_label *gpt; |
|
|
|
assert(cxt); |
|
@@ -1746,16 +1746,8 @@ static int gpt_create_disklabel(struct fdisk_context *cxt) |
|
cxt->label->nparts_max = le32_to_cpu(gpt->pheader->npartition_entries); |
|
cxt->label->nparts_cur = 0; |
|
|
|
- uid = &gpt->pheader->disk_guid; |
|
- fdisk_info(cxt, _("Building a new GPT disklabel " |
|
- "(GUID: %08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X)\n"), |
|
- uid->time_low, uid->time_mid, |
|
- uid->time_hi_and_version, |
|
- uid->clock_seq_hi, |
|
- uid->clock_seq_low, |
|
- uid->node[0], uid->node[1], |
|
- uid->node[2], uid->node[3], |
|
- uid->node[4], uid->node[5]); |
|
+ guid_to_string(&gpt->pheader->disk_guid, str); |
|
+ fdisk_info(cxt, _("Building a new GPT disklabel (GUID: %s)\n"), str); |
|
fdisk_label_set_changed(cxt->label, 1); |
|
done: |
|
return rc; |
|
-- |
|
2.9.3
|
|
|