From: Fabian Deutsch <fabiand@fedoraproject.org>
Date: Thu, 25 Jun 2015 09:17:59 +0000 (+0200)
Subject: Revert "lvm: Don't activate LVs with activationskip set"
X-Git-Tag: 044~172^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F76%2Fhead;p=thirdparty%2Fdracut.git

Revert "lvm: Don't activate LVs with activationskip set"

This reverts commit cfa365a32d47388c8476064b23d7d4684f1e591b.

The logic in commit cfa365a was added to prevent (odl) lvms from
activating snapshots which should not be activated.
Newer lvms however do this automatically (not enabling an LV if the
the 'k' attribute set), thus we can revert the previous commit.
---

diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
index ce46e1455..749564408 100755
--- a/modules.d/90lvm/lvm_scan.sh
+++ b/modules.d/90lvm/lvm_scan.sh
@@ -106,10 +106,6 @@ if [ -n "$LVS" ] ; then
     info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
     lvm lvscan --ignorelockingfailure 2>&1 | vinfo
     for LV in $LVS; do
-        if [ "x$(lvm lvs --noheadings --select "lv_attr =~ k" $LV | wc -l)" = "x0" ]; then
-            info "Skipping activation of '$LV' because activationskip is set."
-            continue
-        fi
         if [ -z "$sysinit" ]; then
             lvm lvchange --yes -ay --ignorelockingfailure $nopoll --ignoremonitoring $LV 2>&1 | vinfo
         else