From: Karel Zak <kzak@redhat.com>
Date: Wed, 13 Apr 2016 12:41:47 +0000 (+0200)
Subject: wipefs: force GPT detection
X-Git-Tag: v2.29-rc1~295
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=949e5c960037c377d8c6f696758082e0f20e98f6;p=thirdparty%2Futil-linux.git

wipefs: force GPT detection

The library libblkid (as well as fdisks) requires protective MBR when
probe for GPT by default.  This is unnecessary for wipefs where we're
more promiscuous and we want to delete as much as possible. This patch
enables BLKID_PARTS_FORCE_GPT for wipefs.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1326474
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 9cd29ad98e..0021e76e60 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -261,8 +261,8 @@ new_probe(const char *devname, int mode)
 			BLKID_SUBLKS_BADCSUM);	/* accept bad checksums */
 
 	blkid_probe_enable_partitions(pr, 1);
-	blkid_probe_set_partitions_flags(pr, BLKID_PARTS_MAGIC);
-
+	blkid_probe_set_partitions_flags(pr, BLKID_PARTS_MAGIC |
+					     BLKID_PARTS_FORCE_GPT);
 	return pr;
 error:
 	blkid_free_probe(pr);