summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCésar García <cesarg9@gmail.com>2010-09-10 15:20:31 +0200
committerDanny Kukawka <danny.kukawka@web.de>2010-09-10 15:20:31 +0200
commita20a7d126db0986c4113fa464fde60d34d91abe6 (patch)
treeda84c1d7312325dc89f687033f16f11349ac4913
parentbd9c744efb24881c56e5baf05a7c4044ba359b32 (diff)
fix probing of optical disc volumes by ignoring raid
Fixed probing of optical disc volumes by ignoring raid. Calling "blkid -p -u raid /dev/sr0" blocks the dvd-drive as the same as hal does. Note that "blkid -p -u filesystem,crypto,other /dev/sr0" or "blkid -p -u noraid /dev/sr0" don't hang and return the detected filesystem. This is a patch that filter out the raid detection on disk volumes so hal can detect the filesystem and mount the disk. fd.o#15335
-rw-r--r--hald/linux/probing/probe-volume.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
index 7268fffd..bc91a51b 100644
--- a/hald/linux/probing/probe-volume.c
+++ b/hald/linux/probing/probe-volume.c
@@ -620,6 +620,9 @@ main (int argc, char *argv[])
BLKID_PROBREQ_USAGE | BLKID_PROBREQ_VERSION);
HAL_INFO (("invoking blkid_do_safeprobe, offset=%d, size=%d", vol_probe_offset, vol_size));
+ if (is_disc) {
+ blkid_probe_filter_usage(pr, BLKID_FLTR_NOTIN, BLKID_USAGE_RAID);
+ }
bid_ret = blkid_probe_set_device (pr, fd, vol_probe_offset, vol_size);
if (bid_ret == 0) {
bid_ret = blkid_do_safeprobe (pr);