fdisk: improve MBR detection

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index 34465ef327026d5c562a3fbe1dd7f1a90f4ee756..e2ec0d3b4b7b3348fa7425a729d0a7ee2fd7bdec 100644 (file)
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -428,6 +428,10 @@ static int dos_reset_alignment(struct fdisk_context *cxt)
        return 0;
 }
 
+/* TODO: move to include/pt-dos.h and share with libblkid */
+#define AIX_MAGIC_STRING       "\xC9\xC2\xD4\xC1"
+#define AIX_MAGIC_STRLEN       (sizeof(AIX_MAGIC_STRING) - 1)
+
 static int dos_probe_label(struct fdisk_context *cxt)
 {
        size_t i;
@@ -437,6 +441,10 @@ static int dos_probe_label(struct fdisk_context *cxt)
        assert(cxt->label);
        assert(fdisk_is_disklabel(cxt, DOS));
 
+       /* ignore disks with AIX magic number */
+       if (memcmp(cxt->firstsector, AIX_MAGIC_STRING, AIX_MAGIC_STRLEN) == 0)
+               return 0;
+
        if (!mbr_is_valid_magic(cxt->firstsector))
                return 0;