Browse Source

feat(lvm): update lvm command options

Drop checking for options that have been available for
at least ten years.  This simplifies code maintenance.

Add the new --nohints option (when available) to disable
the use of hints which is not useful during startup.
master
David Teigland 3 years ago committed by Jóhann B. Guðmundsson
parent
commit
c0a54f2993
  1. 41
      modules.d/90lvm/lvm_scan.sh

41
modules.d/90lvm/lvm_scan.sh

@ -59,39 +59,42 @@ min=$2
sub=${3%% *} sub=${3%% *}
sub=${sub%%\(*} sub=${sub%%\(*}


lvm_ignorelockingfailure="--ignorelockingfailure" # For lvchange and vgchange use --sysinit which:
lvm_quirk_args="--ignorelockingfailure --ignoremonitoring" # disables polling (--poll n)

# ignores monitoring (--ignoremonitoring)
check_lvm_ver 2 2 57 "$maj" "$min" "$sub" \ # ignores locking failures (--ignorelockingfailure)
&& lvm_quirk_args="$lvm_quirk_args --poll n" # disables hints (--nohints)

#
if check_lvm_ver 2 2 65 "$maj" "$min" "$sub"; then # For lvscan and vgscan:
lvm_quirk_args=" --sysinit $extraargs" # disable locking (--nolocking)
fi # disable hints (--nohints)


if check_lvm_ver 2 2 221 "$maj" "$min" "$sub"; then activate_args="--sysinit $extraargs"
lvm_quirk_args=" $extraargs"
unset lvm_ignorelockingfailure
fi

unset extraargs unset extraargs


export LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 export LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1


scan_args="--nolocking"

check_lvm_ver 2 3 14 "$maj" "$min" "$sub" \
&& scan_args="$scan_args --nohints"

if [ -n "$LVS" ]; then if [ -n "$LVS" ]; then
info "Scanning devices $lvmdevs for LVM logical volumes $LVS" info "Scanning devices $lvmdevs for LVM logical volumes $LVS"
lvm lvscan $lvm_ignorelockingfailure 2>&1 | vinfo # shellcheck disable=SC2086
lvm lvscan $scan_args 2>&1 | vinfo
for LV in $LVS; do for LV in $LVS; do
# shellcheck disable=SC2086 # shellcheck disable=SC2086
lvm lvchange --yes -K -ay $lvm_quirk_args "$LV" 2>&1 | vinfo lvm lvchange --yes -K -ay $activate_args "$LV" 2>&1 | vinfo
done done
fi fi


if [ -z "$LVS" ] || [ -n "$VGS" ]; then if [ -z "$LVS" ] || [ -n "$VGS" ]; then
info "Scanning devices $lvmdevs for LVM volume groups $VGS" info "Scanning devices $lvmdevs for LVM volume groups $VGS"
lvm vgscan $lvm_ignorelockingfailure 2>&1 | vinfo
# shellcheck disable=SC2086 # shellcheck disable=SC2086
lvm vgchange -ay $lvm_quirk_args $VGS 2>&1 | vinfo lvm vgscan $scan_args 2>&1 | vinfo
# shellcheck disable=SC2086
lvm vgchange -ay $activate_args $VGS 2>&1 | vinfo
fi fi


if [ "$lvmwritten" ]; then if [ "$lvmwritten" ]; then

Loading…
Cancel
Save