From: Karel Zak Date: Tue, 9 May 2023 11:19:20 +0000 (+0200) Subject: libfdisk: use BLKID_SUBLKS_BADCSUM and BLKID_PARTS_FORCE_GPT X-Git-Tag: v2.39~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de75e0cba746895cfa776762efc29a3aa3a2039e;p=thirdparty%2Futil-linux.git libfdisk: use BLKID_SUBLKS_BADCSUM and BLKID_PARTS_FORCE_GPT Let's keep libblkid in more promiscuous mode to detect more possible signatures. Signed-off-by: Karel Zak --- diff --git a/libfdisk/src/wipe.c b/libfdisk/src/wipe.c index ab1d7b8519..c3d5d754b2 100644 --- a/libfdisk/src/wipe.c +++ b/libfdisk/src/wipe.c @@ -134,9 +134,11 @@ int fdisk_do_wipe(struct fdisk_context *cxt) } blkid_probe_enable_superblocks(pr, 1); - blkid_probe_set_superblocks_flags(pr, BLKID_SUBLKS_MAGIC); + blkid_probe_set_superblocks_flags(pr, BLKID_SUBLKS_MAGIC | + BLKID_SUBLKS_BADCSUM); 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); while (blkid_do_probe(pr) == 0) { DBG(WIPE, ul_debugobj(wp, " wiping...")); @@ -183,8 +185,10 @@ int fdisk_check_collisions(struct fdisk_context *cxt) cxt->collision = NULL; blkid_probe_enable_superblocks(pr, 1); - blkid_probe_set_superblocks_flags(pr, BLKID_SUBLKS_TYPE); + blkid_probe_set_superblocks_flags(pr, BLKID_SUBLKS_TYPE | + BLKID_SUBLKS_BADCSUM); blkid_probe_enable_partitions(pr, 1); + blkid_probe_set_partitions_flags(pr, BLKID_PARTS_FORCE_GPT); /* we care about the first found FS/raid, so don't call blkid_do_probe() * in loop or don't use blkid_do_fullprobe() ... */