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

[Bastian Blank]

Author: waldi
Date: Fri Nov  6 16:40:44 2009
New Revision: 759

Log:
debian/tree/dmsetup/lib/udev/rules.d,
debian/tree/lvm2/lib/udev/rules.d: Rules update.

Modified:
   lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules
   lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules
   lvm2/trunk/debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules
   lvm2/trunk/debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules

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	Fri Oct 30 14:40:52 2009	(r758)
+++ lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules	Fri Nov  6 16:40:44 2009	(r759)
@@ -5,6 +5,13 @@
 
 SUBSYSTEM!="block", GOTO="dm_end"
 KERNEL!="dm-[0-9]*", GOTO="dm_end"
+
+# 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
+# kernels >= 2.6.31 only.
+ENV{DM_COOKIE}=="?*", IMPORT{program}="/sbin/dmsetup udevflags $env{DM_COOKIE}"
+
 ACTION!="add|change", GOTO="dm_end"
 
 # Normally, we operate on "change" events only. But when
@@ -33,7 +40,16 @@
 
 ENV{DM_NAME}=="?*", NAME="mapper/$env{DM_NAME}", SYMLINK+="$kernel"
 
-ENV{DM_UUID}=="CRYPT-TEMP-?*", ENV{DM_HIDE}="1"
-ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", ENV{DM_HIDE}="1"
+ENV{DM_UDEV_RULES}="1"
+
+# We have to ignore further rule application for inappropriate events
+# and devices. But still send the notification if cookie exists.
+ENV{DM_UUID}=="mpath-?*", ENV{DM_ACTION}=="PATH_FAILED", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
+ENV{DM_UUID}=="CRYPT-TEMP-?*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
+ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
+
+ENV{DM_SUSPENDED}=="1", ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}="1"
+
+ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="", ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}="1"
 
 LABEL="dm_end"

Modified: lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules
==============================================================================
--- lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules	Fri Oct 30 14:40:52 2009	(r758)
+++ lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules	Fri Nov  6 16:40:44 2009	(r759)
@@ -1,25 +1,15 @@
 # Udev rules for device-mapper devices.
 # See /usr/share/doc/dmsetup/README.udev for further information.
 
-SUBSYSTEM!="block", GOTO="persistent_storage_dm_end"
-KERNEL!="dm-[0-9]*", GOTO="persistent_storage_dm_end"
-ACTION!="add|change", GOTO="persistent_storage_dm_end"
-ENV{DM_NAME}!="?*", GOTO="persistent_storage_dm_end"
-
-# Normally, we operate on "change" events only. But when
-# coldplugging, there's an "add" event present. We have to
-# recognize this and do our actions in this particular
-# situation, too.
-ACTION=="add", ENV{STARTUP}!="1", GOTO="persistent_storage_dm_end"
+ENV{DM_UDEV_RULES}=="", GOTO="persistent_storage_dm_end"
+
+OPTIONS="link_priority=-100"
+ENV{DM_UUID}=="DMRAID-*", OPTIONS="link_priority=100"
 
 SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"
 ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
 
-ENV{DM_SUSPENDED}=="1", GOTO="persistent_storage_dm_end"
-ENV{DM_HIDE}=="1", GOTO="persistent_storage_dm_end"
-
-OPTIONS="link_priority=-100"
-ENV{DM_UUID}=="DMRAID-*", OPTIONS="link_priority=100"
+ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}!="", GOTO="persistent_storage_dm_end"
 
 IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"

Modified: lvm2/trunk/debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules
==============================================================================
--- lvm2/trunk/debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules	Fri Oct 30 14:40:52 2009	(r758)
+++ lvm2/trunk/debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules	Fri Nov  6 16:40:44 2009	(r759)
@@ -1,13 +1,14 @@
 # Udev rules for LVM.
 # See /usr/share/doc/lvm2/README.udev for further information.
 
+ENV{DM_UDEV_RULES}=="", GOTO="lvm_end"
 ENV{DM_UUID}!="LVM-?*", GOTO="lvm_end"
 
 # Use DM name and split it up into its VG/LV/layer constituents.
 IMPORT{program}="/sbin/dmsetup splitname --nameprefixes --noheadings --rows $env{DM_NAME}"
 
 # Do not create symlinks for hidden subdevices.
-ENV{DM_LV_NAME}=="?*_mimage_[0-9]*|pvmove?*|?*_vorigin", ENV{DM_HIDE}="1"
-ENV{DM_LV_LAYER}=="?*", ENV{DM_HIDE}="1"
+ENV{DM_LV_NAME}=="?*_mimage_[0-9]*|pvmove?*|?*_vorigin", ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}="1"
+ENV{DM_LV_LAYER}=="?*", ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}="1"
 
 LABEL="lvm_end"

Modified: lvm2/trunk/debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules
==============================================================================
--- lvm2/trunk/debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules	Fri Oct 30 14:40:52 2009	(r758)
+++ lvm2/trunk/debian/tree/lvm2/lib/udev/rules.d/60-persistent-storage-lvm.rules	Fri Nov  6 16:40:44 2009	(r759)
@@ -1,8 +1,10 @@
 # Udev rules for LVM.
 # See /usr/share/doc/lvm2/README.udev for further information.
 
+ENV{DM_UDEV_RULES}=="", GOTO="persistent_storage_lvm_end"
 ENV{DM_UUID}!="LVM-?*", GOTO="persistent_storage_lvm_end"
-ENV{DM_HIDE}!="", GOTO="persistent_storage_lvm_end"
+ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}!="", GOTO="persistent_storage_lvm_end"
+ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}!="", GOTO="persistent_storage_lvm_end"
 
 ENV{DM_VG_NAME}=="?*", ENV{DM_LV_NAME}=="?*", ENV{DM_LV_LAYER}=="", SYMLINK+="$env{DM_VG_NAME}/$env{DM_LV_NAME}"