r808 - in lvm2/trunk/debian: . tree/dmsetup/lib/udev/rules.d

[Bastian Blank]

Author: waldi
Date: Wed May 19 11:07:53 2010
New Revision: 808

Log:
* debian/changelog: Update.
* debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules: Adopt changes.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Wed May 19 10:52:30 2010	(r807)
+++ lvm2/trunk/debian/changelog	Wed May 19 11:07:53 2010	(r808)
@@ -5,6 +5,7 @@
   * Fix readline support. (closes: #575640)
   * Built-in cluster locking.
   * Build liblvm2app and liblvm2cmd. (closes: #564810)
+  * Adopt some update udev rule changes.
 
  -- Bastian Blank <waldi at debian.org>  Sat, 15 May 2010 14:38:31 +0000
 

Modified: lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules
==============================================================================
--- lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules	Wed May 19 10:52:30 2010	(r807)
+++ lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules	Wed May 19 11:07:53 2010	(r808)
@@ -6,6 +6,13 @@
 SUBSYSTEM!="block", GOTO="dm_end"
 KERNEL!="dm-[0-9]*", GOTO="dm_end"
 
+# There is a new change event generated in block layer since kernel
+# version 2.6.32. It adds notification for changes in read-only
+# attribute. We don't want to misinterpret the regular meaning of change
+# events for DM devices and we don't want to apply the rules prematurely,
+# therefore we disable them in this situation.
+ENV{DISK_RO}=="1", GOTO="dm_disable"
+
 # Decode udev control flags and set environment variables appropriately.
 # These flags are encoded in DM_COOKIE variable that was introduced in
 # kernel version 2.6.31. Therefore, we can use this feature with
@@ -52,4 +59,11 @@
 
 ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="", ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}="1"
 
+GOTO="dm_end"
+
+LABEL="dm_disable"
+ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}="1"
+ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}="1"
+ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
+
 LABEL="dm_end"