shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

lvmdump: double quote

Browse Source 
Double quote to prevent globbing and word splitting.
This commit is contained in:
Zdenek Kabelac 2017-06-28 20:48:19 +02:00
parent 6330e2dc86
commit e292c1a1ca
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
scripts/lvmdump.sh.in
View File

@ -1,7 +1,7 @@
#!/bin/bash
# We use some bash-isms (getopts?)
# Copyright (C) 2007-2015 Red Hat, Inc. All rights reserved.
# Copyright (C) 2007-2017 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@ -53,7 +53,7 @@ LVMPOLLD_SOCKET=${LVM_LVMPOLLD_SOCKET-/var/run/lvm/lvmpolld.socket}
die() {
code=$1; shift
echo "$@" 1>&2
exit $code
exit "$code"
}
"$LVM" version >& /dev/null || die 2 "Could not run lvm binary '$LVM'"
@ -106,12 +106,12 @@ else
dir="$HOME/$dirbase"
fi
if test -d $dir ; then
(shopt -s nullglob dotglob; test -r $dir -a -w $dir -a -x $dir && cd $dir && files=(*) && ((! ${#files[@]}))) || \
if test -d "$dir" ; then
(shopt -s nullglob dotglob; test -r "$dir" -a -w "$dir" -a -x "$dir" && cd "$dir" && files=(*) && ((! ${#files[@]}))) || \
die 5 "Fatal: directory $dir already exists and is not empty or inaccessible"
else
test -e $dir && die 3 "Fatal: $dir already exists"
$MKDIR -p $dir || die 4 "Fatal: could not create $dir"
test -e "$dir" && die 3 "Fatal: $dir already exists"
"$MKDIR" -p "$dir" || die 4 "Fatal: could not create $dir"
fi
log="$dir/lvmdump.log"
@ -193,7 +193,7 @@ if (( $clustered )); then
echo "MASTER:"
cat /debug/dlm/clvmd_master
fi
} >> $dir/cluster_info
} >> "$dir/cluster_info"
fi
myecho "Gathering LVM & device-mapper version info..."
@ -238,14 +238,14 @@ if (( $metadata )); then
log "$MKDIR -p \"$dir/metadata\""
pvs="$("$LVM" pvs --separator , --noheadings --units s --nosuffix -o \
name,pe_start 2>> "$log" | $SED -e 's/^ *//')"
pvs=$("$LVM" pvs --separator , --noheadings --units s --nosuffix -o \
name,pe_start 2>> "$log" | $SED -e 's/^ *//')
for line in $pvs
do
test -z "$line" && continue
pv="$(echo $line | $CUT -d, -f1)"
pe_start="$(echo $line | $CUT -d, -f2)"
name="$($BASENAME "$pv")"
pv=$(echo "$line" | "$CUT" -d, -f1)
pe_start=$(echo "$line" | "$CUT" -d, -f2)
name=$("$BASENAME" "$pv")
myecho " $pv"
log "$DD if=$pv \"of=$dir/metadata/$name\" $DDFLAGS bs=512 count=$pe_start 2>> \"$log\""
done
@ -257,21 +257,21 @@ if (( $sysreport )); then
sysreport_dir="$dir/sysreport"
log_lines=10000
SYSTEMCTL=$(which systemctl 2>> $log)
JOURNALCTL=$(which journalctl 2>> $log)
LSBLK=$(which lsblk 2>> $log)
SYSTEMCTL=$(which systemctl 2>> "$log")
JOURNALCTL=$(which journalctl 2>> "$log")
LSBLK=$(which lsblk 2>> "$log")
log "$MKDIR -p \"$sysreport_dir\""
if test -z "LSBLK"; then
myecho "WARNING: lsblk not found"
else
if $LSBLK --help | $GREP -- --output-all >/dev/null; then
if "$LSBLK" --help | "$GREP" -- --output-all >/dev/null; then
log "$LSBLK -O >> \"$sysreport_dir/lsblk_O\""
else
log "$LSBLK >> \"$sysreport_dir/lsblk\""
fi
if $LSBLK --help | $GREP -- --inverse >/dev/null; then
if "$LSBLK" --help | "$GREP" -- --inverse >/dev/null; then
log "$LSBLK -s >> \"$sysreport_dir/lsblk_s\""
fi
fi
@ -294,7 +294,7 @@ if (( $sysreport )); then
lvm2-activation-net.service \
> \"$sysreport_dir/systemd_lvm2_services_status\" 2>> \"$log\""
log "$SYSTEMCTL list-units -l -a --no-legend --no-pager > \"$sysreport_dir/systemd_unit_list\" 2>> \"$log\""
for unit in $(cat $sysreport_dir/systemd_unit_list | $GREP lvm2-pvscan | cut -d " " -f 1); do
for unit in $(cat "$sysreport_dir/systemd_unit_list" | "$GREP" lvm2-pvscan | cut -d " " -f 1); do
log "$SYSTEMCTL status -l --no-pager -n $log_lines -o short-precise $unit >> \"$sysreport_dir/systemd_lvm2_pvscan_service_status\""
done
fi
@ -316,12 +316,12 @@ fi
if (( $lvmetad )); then
(echo 'request="dump"'; echo '##') | {
if type -p $SOCAT >& /dev/null; then
if type -p "$SOCAT" >& /dev/null; then
echo "$SOCAT unix-connect:$LVMETAD_SOCKET -" >> "$log"
$SOCAT "unix-connect:$LVMETAD_SOCKET" - 2>> "$log"
elif echo | $NC -U "$LVMETAD_SOCKET"; then
"$SOCAT" "unix-connect:$LVMETAD_SOCKET" - 2>> "$log"
elif echo | "$NC" -U "$LVMETAD_SOCKET"; then
echo "$NC -U $LVMETAD_SOCKET" >> "$log"
$NC -U "$LVMETAD_SOCKET" 2>> "$log"
"$NC" -U "$LVMETAD_SOCKET" 2>> "$log"
else
myecho "WARNING: Neither socat nor nc -U seems to be available." 1>&2
echo "# DUMP FAILED"
@ -332,12 +332,12 @@ fi
if (( $lvmpolld )); then
(echo 'request="dump"'; echo '##') | {
if type -p $SOCAT >& /dev/null; then
if type -p "$SOCAT" >& /dev/null; then
echo "$SOCAT unix-connect:$LVMPOLLD_SOCKET -" >> "$log"
$SOCAT "unix-connect:$LVMPOLLD_SOCKET" - 2>> "$log"
elif echo | $NC -U "$LVMPOLLD_SOCKET"; then
"$SOCAT" "unix-connect:$LVMPOLLD_SOCKET" - 2>> "$log"
elif echo | "$NC" -U "$LVMPOLLD_SOCKET"; then
echo "$NC -U $LVMPOLLD_SOCKET" >> "$log"
$NC -U "$LVMPOLLD_SOCKET" 2>> "$log"
"$NC" -U "$LVMPOLLD_SOCKET" 2>> "$log"
else
myecho "WARNING: Neither socat nor nc -U seems to be available." 1>&2
echo "# DUMP FAILED"