hal: Branch 'master' - 3 commits

[Danny Kukawka]

 Makefile.am                       |    2 +-
 hald/linux/probing/probe-volume.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c0354cd507b2ba82089d0c785c864fd4b37295ed
Merge: ae13d96... a20a7d1...
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Aug 10 10:58:06 2011 +0200

    Merge branch 'master' of ssh://people.freedesktop.org/~dkukawka/hal

commit a20a7d126db0986c4113fa464fde60d34d91abe6
Author: César García <cesarg9 at gmail.com>
Date:   Fri Sep 10 15:20:31 2010 +0200

    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

diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
index 7268fff..bc91a51 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);
commit bd9c744efb24881c56e5baf05a7c4044ba359b32
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Sep 10 15:14:28 2010 +0200

    remove archives from 'make dist' on make clean
    
    Remove archives from 'make dist' (hal-*.tar.{bz2,gz}) on make clean.

diff --git a/Makefile.am b/Makefile.am
index 748c55f..13562b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,4 +34,4 @@ DISTCLEANFILES = hal.pc hal-storage.pc
 EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in ChangeLog
 
 clean-local :
-	rm -f *~
+	rm -f *~ hal-*.tar.bz2 hal-*.tar.gz