Skip to content

Commit

Permalink
fix(lvm): clean up whitespace in messages
Browse files Browse the repository at this point in the history
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.)
  • Loading branch information
teigland committed Aug 29, 2024
1 parent 5d2bda4 commit 4e6d3b1
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions modules.d/90lvm/lvm_scan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit 4e6d3b1

Please sign in to comment.