]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Revert "libblkid: support LSI RAID on partition too"
authorKarel Zak <kzak@redhat.com>
Thu, 15 Oct 2015 10:04:35 +0000 (12:04 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 15 Oct 2015 10:04:35 +0000 (12:04 +0200)
This reverts commit bc9007c372765ad4a1c7e1d3d69ba8be800f250f.

We need a better way, it seems that the original report is mostly
about udev rules disadvantages than about libblkid bug. See RH
bugzilla (#1172510) for more details.

libblkid/src/superblocks/lsi_raid.c

index f421ac9dbe8e2f8c80b0026359bd34fa09db516e..697b0fe89bdb8e36497788ebe7c860b69b002997 100644 (file)
@@ -31,6 +31,8 @@ static int probe_lsiraid(blkid_probe pr,
 
        if (pr->size < 0x10000)
                return 1;
+       if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+               return 1;
 
        off = ((pr->size / 0x200) - 1) * 0x200;
        lsi = (struct lsi_metadata *)