libblkid: don't probe for GPT and Unixware PT on floppies

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

diff --git a/shlibs/blkid/src/partitions/gpt.c b/shlibs/blkid/src/partitions/gpt.c
index 2ec3f7397917f1b59ae1aa88ca421510e6d06a32..2c3a3267fd1f4f75eda986d7368e00c5753c1034 100644 (file)
--- a/shlibs/blkid/src/partitions/gpt.c
+++ b/shlibs/blkid/src/partitions/gpt.c
@@ -368,6 +368,7 @@ const struct blkid_idinfo gpt_pt_idinfo =
 {
        .name           = "gpt",
        .probefunc      = probe_gpt_pt,
+       .minsz          = 1024 * 1440 + 1,      /* ignore floppies */
 
        /*
         * It would be possible to check for DOS signature (0xAA55), but

diff --git a/shlibs/blkid/src/partitions/partitions.c b/shlibs/blkid/src/partitions/partitions.c
index 82861a5b362d7574cc3bc375d11b1e54e37e1195..154365d79d63829674fab720f83112ef9f055a1f 100644 (file)
--- a/shlibs/blkid/src/partitions/partitions.c
+++ b/shlibs/blkid/src/partitions/partitions.c
@@ -505,6 +505,9 @@ static int idinfo_probe(blkid_probe pr, const struct blkid_idinfo *id)
        int hasmag = 0;
        int rc = 1;             /* = nothing detected */
 
+       if (id->minsz && id->minsz > pr->size)
+               goto nothing;   /* the device is too small */
+
        mag = id->magics ? &id->magics[0] : NULL;
 
        /* try to detect by magic string */

diff --git a/shlibs/blkid/src/partitions/unixware.c b/shlibs/blkid/src/partitions/unixware.c
index 70b6626f35ebbc2f751b862c390e7ab5382491aa..62dba76479a6142a7d74b4f3a0d75a4f1501b491 100644 (file)
--- a/shlibs/blkid/src/partitions/unixware.c
+++ b/shlibs/blkid/src/partitions/unixware.c
@@ -173,6 +173,7 @@ const struct blkid_idinfo unixware_pt_idinfo =
 {
        .name           = "unixware",
        .probefunc      = probe_unixware_pt,
+       .minsz          = 1024 * 1440 + 1,              /* ignore floppies */
        .magics         =
        {
                {