From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 5 Apr 2011 20:16:00 +0000 (+0200)
Subject: Remove blkid probing of device-mapper nodes
X-Git-Tag: upstream/2.1.2~557
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f01c260f42f4478160b9baf45d8298b2f02421e;p=platform%2Fupstream%2Fudisks2.git

Remove blkid probing of device-mapper nodes

This was introduced years ago when udev rules were still something new, but
these workarounds really should not be in udev any longer.

lvm2 has shipped udev/13-dm-disk.rules with that blkid command for at least a
year (probably longer).
---

diff --git a/data/80-udisks.rules b/data/80-udisks.rules
index a8afe92..94119b5 100644
--- a/data/80-udisks.rules
+++ b/data/80-udisks.rules
@@ -91,23 +91,6 @@ 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
 #