From: Harald Hoyer <harald@redhat.com>
Date: Fri, 30 Mar 2012 08:48:37 +0000 (+0200)
Subject: 90lvm/module-setup.sh: ignore DM_UDEV_DISABLE_DISK_RULES_FLAG=1
X-Git-Tag: 018~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=030b8a160f93186553ef6ae1db45039217196dbb;p=thirdparty%2Fdracut.git

90lvm/module-setup.sh: ignore DM_UDEV_DISABLE_DISK_RULES_FLAG=1

Ignore logical volumes, which have DM_UDEV_DISABLE_DISK_RULES_FLAG=1
set for the generation of hostonly cmdline parameter.
---

diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
index c40dd2937..cf46372eb 100755
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -11,9 +11,9 @@ check() {
     [[ $debug ]] && set -x
 
     check_lvm() {
-        unset DM_VG_NAME
-        unset DM_LV_NAME
-        eval $(udevadm info --query=property --name=$1|egrep '(DM_VG_NAME|DM_LV_NAME)=')
+        local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
+        eval $(udevadm info --query=property --name=$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
+        [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
         [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
         if ! strstr " ${_activated[*]} " " ${DM_VG_NAME}/${DM_LV_NAME} "; then
             if ! [[ $kernel_only ]]; then