From 4e6d3b13cb6890009a32a4776d2f681b787a686a Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 27 Aug 2024 15:51:44 -0500 Subject: [PATCH] fix(lvm): clean up whitespace in messages The lvm module has been printing messages with whitespace damage: Scanning devices sda sdb for LVM logical volumes vg/root vg/swap Remove the trailing space after the final device name, and remove the newlines between LV names. The message above becomes: Scanning devices sda sdb for LVM logical volumes vg/root vg/swap (The same change is made to the VG activation message.) --- modules.d/90lvm/lvm_scan.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh index 980e449071..6cb881f4e5 100755 --- a/modules.d/90lvm/lvm_scan.sh +++ b/modules.d/90lvm/lvm_scan.sh @@ -134,7 +134,8 @@ check_lvm_ver 2 3 14 "$maj" "$min" "$sub" \ && scan_args="$scan_args --nohints" if [ -n "$LVS" ]; then - info "Scanning devices $lvmdevs for LVM logical volumes $LVS" + # shellcheck disable=SC2086 disable=SC2116 + info "Scanning devices ${lvmdevs% } for LVM logical volumes $(echo $LVS)" # shellcheck disable=SC2086 LVSLIST=$(lvm lvs $scan_args --noheading -o lv_full_name,segtype $LVS) info "$LVSLIST" @@ -154,7 +155,8 @@ if [ -n "$LVS" ]; then fi if [ -z "$LVS" ] || [ -n "$VGS" ]; then - info "Scanning devices $lvmdevs for LVM volume groups $VGS" + # shellcheck disable=SC2086 disable=SC2116 + info "Scanning devices ${lvmdevs% } for LVM volume groups $(echo $VGS)" # shellcheck disable=SC2086 lvm vgscan $scan_args 2>&1 | vinfo # shellcheck disable=SC2086