summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2015-08-12 23:50:42 +0059
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2015-08-13 00:07:39 +0059
commit4ed878b6287eed1d538e65bd89c9d7bf99040a97 (patch)
treecde0a91f6475b4edaf5b5c212d984d3913c70ba2 /sys-kernel/dracut/files
parentwww-servers/resin: Version bump. Fixes bug 472958 and bug 431416. (diff)
downloadgentoo-4ed878b6287eed1d538e65bd89c9d7bf99040a97.tar.gz
gentoo-4ed878b6287eed1d538e65bd89c9d7bf99040a97.tar.bz2
gentoo-4ed878b6287eed1d538e65bd89c9d7bf99040a97.zip
sys-kernel/dracut: Remove broken LVM activation skip logic
Gentoo-Bug: 553444
Diffstat (limited to 'sys-kernel/dracut/files')
-rw-r--r--sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch b/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch
new file mode 100644
index 000000000000..54d1ef83aba7
--- /dev/null
+++ b/sys-kernel/dracut/files/043-0001-Revert-lvm-Don-t-activate-LVs-with-act.patch
@@ -0,0 +1,33 @@
+From 7c782700a82e6f8b1cb665075e14eaf9d4f70867 Mon Sep 17 00:00:00 2001
+From: Fabian Deutsch <fabiand@fedoraproject.org>
+Date: Thu, 25 Jun 2015 11:17:59 +0200
+Subject: [PATCH] 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.
+---
+ modules.d/90lvm/lvm_scan.sh | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
+index ce46e14..7495644 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
+--
+2.4.5
+