|
 |
d1a34d |
From 2bfe8c53280b6c1e18339dddc5bb60b062cad5bb Mon Sep 17 00:00:00 2001
|
|
|
d1a34d |
From: David Teigland <teigland@redhat.com>
|
|
|
d1a34d |
Date: Wed, 8 Dec 2021 14:04:25 -0600
|
|
|
d1a34d |
Subject: [PATCH] revert(lvm): remove snapshot feature
|
|
|
d1a34d |
|
|
|
d1a34d |
The feature of managing lvm snapshots has no known
|
|
|
d1a34d |
recent usage. It is unknown if it works. The lvm
|
|
|
d1a34d |
developers do not wish to maintain or support it.
|
|
|
d1a34d |
|
|
|
d1a34d |
(cherry picked from commit 1549d5e89818603e1aa6dd8a40981222f59f1548)
|
|
|
d1a34d |
|
|
|
d1a34d |
Resolves: #2037955
|
|
|
d1a34d |
---
|
|
|
d1a34d |
modules.d/90lvm/lvm_scan.sh | 39 ++++-----------------------------------
|
|
|
d1a34d |
1 file changed, 4 insertions(+), 35 deletions(-)
|
|
|
d1a34d |
|
|
|
d1a34d |
diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
|
|
|
d1a34d |
index c42f97d5..43601ad1 100755
|
|
|
d1a34d |
--- a/modules.d/90lvm/lvm_scan.sh
|
|
|
d1a34d |
+++ b/modules.d/90lvm/lvm_scan.sh
|
|
|
d1a34d |
@@ -7,8 +7,6 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
|
|
|
d1a34d |
|
|
|
d1a34d |
VGS=$(getargs rd.lvm.vg -d rd_LVM_VG=)
|
|
|
d1a34d |
LVS=$(getargs rd.lvm.lv -d rd_LVM_LV=)
|
|
|
d1a34d |
-SNAPSHOT=$(getargs rd.lvm.snapshot -d rd_LVM_SNAPSHOT=)
|
|
|
d1a34d |
-SNAPSIZE=$(getargs rd.lvm.snapsize -d rd_LVM_SNAPSIZE=)
|
|
|
d1a34d |
|
|
|
d1a34d |
# shellcheck disable=SC2174
|
|
|
d1a34d |
[ -d /etc/lvm ] || mkdir -m 0755 -p /etc/lvm
|
|
|
d1a34d |
@@ -31,17 +29,10 @@ if [ ! -e /etc/lvm/lvm.conf ]; then
|
|
|
d1a34d |
echo '}'
|
|
|
d1a34d |
|
|
|
d1a34d |
# establish LVM locking
|
|
|
d1a34d |
- if [ -n "$SNAPSHOT" ]; then
|
|
|
d1a34d |
- echo 'global {'
|
|
|
d1a34d |
- echo ' locking_type = 1'
|
|
|
d1a34d |
- echo ' use_lvmetad = 0'
|
|
|
d1a34d |
- echo '}'
|
|
|
d1a34d |
- else
|
|
|
d1a34d |
- echo 'global {'
|
|
|
d1a34d |
- echo ' locking_type = 4'
|
|
|
d1a34d |
- echo ' use_lvmetad = 0'
|
|
|
d1a34d |
- echo '}'
|
|
|
d1a34d |
- fi
|
|
|
d1a34d |
+ echo 'global {'
|
|
|
d1a34d |
+ echo ' locking_type = 4'
|
|
|
d1a34d |
+ echo ' use_lvmetad = 0'
|
|
|
d1a34d |
+ echo '}'
|
|
|
d1a34d |
} > /etc/lvm/lvm.conf
|
|
|
d1a34d |
lvmwritten=1
|
|
|
d1a34d |
fi
|
|
|
d1a34d |
@@ -90,28 +81,6 @@ unset extraargs
|
|
|
d1a34d |
|
|
|
d1a34d |
export LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
|
|
|
d1a34d |
|
|
|
d1a34d |
-if [ -n "$SNAPSHOT" ]; then
|
|
|
d1a34d |
- # HACK - this should probably be done elsewhere or turned into a function
|
|
|
d1a34d |
- # Enable read-write LVM locking
|
|
|
d1a34d |
- sed -i -e 's/\(^[[:space:]]*\)locking_type[[:space:]]*=[[:space:]]*[[:digit:]]/\1locking_type = 1/' /etc/lvm/lvm.conf
|
|
|
d1a34d |
-
|
|
|
d1a34d |
- # Expected SNAPSHOT format "<orig lv name>:<snap lv name>"
|
|
|
d1a34d |
- ORIG_LV=${SNAPSHOT%%:*}
|
|
|
d1a34d |
- SNAP_LV=${SNAPSHOT##*:}
|
|
|
d1a34d |
-
|
|
|
d1a34d |
- info "Removing existing LVM snapshot $SNAP_LV"
|
|
|
d1a34d |
- lvm lvremove --force "$SNAP_LV" 2>&1 | vinfo
|
|
|
d1a34d |
-
|
|
|
d1a34d |
- # Determine snapshot size
|
|
|
d1a34d |
- if [ -z "$SNAPSIZE" ]; then
|
|
|
d1a34d |
- SNAPSIZE=$(lvm lvs --noheadings --units m --options lv_size "$ORIG_LV")
|
|
|
d1a34d |
- info "No LVM snapshot size provided, using size of $ORIG_LV ($SNAPSIZE)"
|
|
|
d1a34d |
- fi
|
|
|
d1a34d |
-
|
|
|
d1a34d |
- info "Creating LVM snapshot $SNAP_LV ($SNAPSIZE)"
|
|
|
d1a34d |
- lvm lvcreate -s -n "$SNAP_LV" -L "$SNAPSIZE" "$ORIG_LV" 2>&1 | vinfo
|
|
|
d1a34d |
-fi
|
|
|
d1a34d |
-
|
|
|
d1a34d |
if [ -n "$LVS" ]; then
|
|
|
d1a34d |
info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
|
|
|
d1a34d |
lvm lvscan $lvm_ignorelockingfailure 2>&1 | vinfo
|
|
|
d1a34d |
|