diff options
| author | Danny Kukawka <danny.kukawka@web.de> | 2011-08-10 10:58:06 +0200 |
|---|---|---|
| committer | Danny Kukawka <danny.kukawka@web.de> | 2011-08-10 10:58:06 +0200 |
| commit | c0354cd507b2ba82089d0c785c864fd4b37295ed (patch) | |
| tree | dbd3dd1324137d17d34ebfbd0e9235e9baa75484 | |
| parent | ae13d96fa2a0612b6000f4b8f6ed9d3564035703 (diff) | |
| parent | a20a7d126db0986c4113fa464fde60d34d91abe6 (diff) | |
Merge branch 'master' of ssh://people.freedesktop.org/~dkukawka/hal
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | hald/linux/probing/probe-volume.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 748c55f5..13562b2d 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 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); |