[arch-commits] Commit in lvm2/trunk (dm-rules-remove-last_rule.patch)

[Thomas Bächler]

    Date: Friday, November 6, 2009 @ 18:41:41
  Author: thomas
Revision: 58298

Add the necessary patch for the dm rules, received from upstream developers

Added:
  lvm2/trunk/dm-rules-remove-last_rule.patch

---------------------------------+
 dm-rules-remove-last_rule.patch |   69 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

Added: dm-rules-remove-last_rule.patch
===================================================================
--- dm-rules-remove-last_rule.patch	                        (rev 0)
+++ dm-rules-remove-last_rule.patch	2009-11-06 23:41:41 UTC (rev 58298)
@@ -0,0 +1,69 @@
+diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in
+index 9c2e256..aba0bf4 100644
+--- a/udev/10-dm.rules.in
++++ b/udev/10-dm.rules.in
+@@ -1,3 +1,7 @@
++# Copyright (C) 2009 Red Hat, Inc. All rights reserved.
++#
++# This file is part of LVM2.
++
+ # Udev rules for device-mapper devices.
+ #
+ # These rules create a DM control node in /dev/(DM_DIR) directory.
+diff --git a/udev/11-dm-lvm.rules b/udev/11-dm-lvm.rules
+index 0dd6167..d7398fe 100644
+--- a/udev/11-dm-lvm.rules
++++ b/udev/11-dm-lvm.rules
+@@ -22,9 +22,14 @@ ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
+ IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup splitname --nameprefixes --noheadings --rows $env{DM_NAME}"
+ 
+ # Do not create symlinks for inappropriate subdevices.
+-ENV{DM_LV_NAME}=="?*_mimage_[0-9]*|pvmove?*|?*_vorigin", GOTO="lvm_end"
++ENV{DM_LV_NAME}=="?*_mimage_[0-9]*|pvmove?*|?*_vorigin", GOTO="lvm_disable"
++ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable"
+ 
+ # Create symlinks for top-level devices only.
+-ENV{DM_VG_NAME}=="?*", ENV{DM_LV_NAME}=="?*", ENV{DM_LV_LAYER}!="?*", SYMLINK+="$env{DM_VG_NAME}/$env{DM_LV_NAME}"
++ENV{DM_VG_NAME}=="?*", ENV{DM_LV_NAME}=="?*", SYMLINK+="$env{DM_VG_NAME}/$env{DM_LV_NAME}", GOTO="lvm_end"
++
++LABEL="lvm_disable"
++ENV{DM_UDEV_DISABLE_DISK_RULES}="1"
++ENV{DM_UDEV_DISABLE_OTHER_RULES}="1"
+ 
+ LABEL="lvm_end"
+diff --git a/udev/13-dm-disk.rules b/udev/13-dm-disk.rules
+index 03d9cbc..271ca22 100644
+--- a/udev/13-dm-disk.rules
++++ b/udev/13-dm-disk.rules
+@@ -10,27 +10,18 @@
+ # suspended.
+ 
+ # "add" event is processed on coldplug only!
+-ACTION!="add|change", GOTO="dm_other"
+-ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_other"
+-ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_other"
++ACTION!="add|change", GOTO="dm_end"
++ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_end"
++ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_end"
+ 
+ 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="dm_other"
++ENV{DM_SUSPENDED}=="1", GOTO="dm_end"
+ 
+ IMPORT{program}="$env{DM_SBIN_PATH}/blkid -o udev -p $tempnode"
+ ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS="link_priority=-100"
+ ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+ 
+-# Cutoff all subsequent rules if instructed by a flag.
+-# This flag should be used in well-founded situations only to prevent
+-# any problems that could arise when processing this event further by
+-# foreign rules (various temporary and hidden devices mostly).
+-LABEL="dm_other"
+-ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="1", GOTO="dm_end"
+-ENV{DM_COOKIE}=="?*", RUN+="$env{DM_SBIN_PATH}/dmsetup udevcomplete $env{DM_COOKIE}"
+-OPTIONS+="last_rule"
+-
+ LABEL="dm_end"