]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libfdisk: use BLKID_SUBLKS_BADCSUM and BLKID_PARTS_FORCE_GPT
authorKarel Zak <kzak@redhat.com>
Tue, 9 May 2023 11:19:20 +0000 (13:19 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 9 May 2023 11:19:20 +0000 (13:19 +0200)
Let's keep libblkid in more promiscuous mode to detect more possible
signatures.

Signed-off-by: Karel Zak <kzak@redhat.com>
libfdisk/src/wipe.c

index ab1d7b8519d9b45d8f3f8169e9e2fb0e0cdec8f2..c3d5d754b208d5c404939e154eb5b62f5b35c086 100644 (file)
@@ -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() ... */