From: David Zeuthen <davidz@redhat.com>
Date: Fri, 26 Aug 2011 17:09:40 +0000 (-0400)
Subject: Revert "Remove blkid probing of device-mapper nodes"
X-Git-Tag: upstream/2.1.2~524
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7611f37e5f01b48b30c3021d15b4e11b3251854d;p=platform%2Fupstream%2Fudisks2.git

Revert "Remove blkid probing of device-mapper nodes"

This reverts commit 8f01c260f42f4478160b9baf45d8298b2f02421e.
---

diff --git a/data/80-udisks.rules b/data/80-udisks.rules
index 94119b5..a8afe92 100644
--- a/data/80-udisks.rules
+++ b/data/80-udisks.rules
@@ -91,6 +91,23 @@ LABEL="probe_parttable_end"
 
 ##############################################################################################################
 
+# pick up device-mapper data; this REALLY should be done by rules installed
+# by the device-mapper package
+#
+KERNEL!="dm-*", GOTO="device_mapper_end"
+ACTION!="change", GOTO="device_mapper_end"
+
+ENV{UDISKS_DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
+
+# avoid probing if it has already been done earlier
+#
+ENV{ID_FS_USAGE}!="", GOTO="device_mapper_end"
+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+
+LABEL="device_mapper_end"
+
+##############################################################################################################
+
 # pick up data from MD components; this REALLY should be done by rules installed
 # by mdadm or the kernel package
 #