From: Peter Rajnoha <prajnoha@redhat.com>
Date: Thu, 7 Jan 2010 20:01:55 +0000 (+0000)
Subject: Always set environment variables for an LVM2 device in 11-dm-lvm.rules.
X-Git-Tag: v2_02_91~2426
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=62ecac818708ff50a107792725628c6ac3b0bcb8;p=lvm2.git

Always set environment variables for an LVM2 device in 11-dm-lvm.rules.

This way we can still use DM_LV_NAME, DM_VG_NAME and DM_LV_LAYER in all
the other rules.
---

diff --git a/WHATS_NEW b/WHATS_NEW
index d2a3cf64d..5df95a73f 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.57 -
 ====================================
+  Always set environment variables for an LVM2 device in 11-dm-lvm.rules.
   Add activation/udev_rules config option in lvm.conf.
   Add macro outfc() and export out_text_with_comment().
   Add macros outsize() and outhint().
diff --git a/udev/11-dm-lvm.rules b/udev/11-dm-lvm.rules
index 7d1dfcd35..49fa10be3 100644
--- a/udev/11-dm-lvm.rules
+++ b/udev/11-dm-lvm.rules
@@ -16,11 +16,12 @@
 ACTION!="add|change", GOTO="lvm_end"
 ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="lvm_end"
 ENV{DM_UUID}!="LVM-?*", GOTO="lvm_end"
-ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
 
 # Use DM name and split it up into its VG/LV/layer constituents.
 IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup splitname --nameprefixes --noheadings --rows $env{DM_NAME}"
 
+ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
+
 # Do not create symlinks for inappropriate subdevices.
 ENV{DM_LV_NAME}=="?*_mimage_[0-9]*|pvmove?*|?*_vorigin", GOTO="lvm_disable"
 ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable"