summaryrefslogtreecommitdiffstats
path: root/shlibs
diff options
context:
space:
mode:
Diffstat (limited to 'shlibs')
-rw-r--r--shlibs/blkid/src/superblocks/superblocks.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/shlibs/blkid/src/superblocks/superblocks.c
index d1deb5eaf..a1e1d3607 100644
--- a/shlibs/blkid/src/superblocks/superblocks.c
+++ b/shlibs/blkid/src/superblocks/superblocks.c
@@ -334,14 +334,13 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn)
mag = id->magics ? &id->magics[0] : NULL;
- /* don't probe for RAIDs, swap or journal on floppies */
+ /* don't probe for RAIDs, swap or journal on CD/DVDs */
if ((id->usage & (BLKID_USAGE_RAID | BLKID_USAGE_OTHER)) &&
- blkid_probe_is_tiny(pr))
+ blkid_probe_is_cdrom(pr))
continue;
- /* don't probe for RAIDs, swap or journal on floppies or CD/DVDs */
- if ((id->usage & (BLKID_USAGE_RAID | BLKID_USAGE_OTHER)) &&
- (blkid_probe_is_tiny(pr) || blkid_probe_is_cdrom(pr)))
+ /* don't probe for RAIDs on floppies */
+ if ((id->usage & BLKID_USAGE_RAID) && blkid_probe_is_tiny(pr))
continue;
DBG(DEBUG_LOWPROBE, printf("[%d] %s:\n", i, id->name));