Fix a bug in lvm_dump.sh checks for lvm/dmsetup binaries quote the

invocations a bit more (although i'm fairly sure there are still
quotes missing somewhere due to the eval in log).

diff --git a/WHATS_NEW b/WHATS_NEW
index 3d19f142b1ca1714be723209f60bea33b9efa2fc..afbb771e76689245c195bcf99980ecde1bf87635 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.29 -
 ==================================
+  Fix a bug in lvm_dump.sh checks for lvm/dmsetup binaries.
   Refactor lvcreate stripe and mirror parameter validation.
   All tools: print --help output to stdout, not stderr.
   After a diagnostic, suggest --help, rather than printing all --help output.

diff --git a/scripts/lvm_dump.sh b/scripts/lvm_dump.sh
index 18fddefe088ab23f849487fbae6b3c567bbb087e..d9f44cede4f012b875311d0d6c6f51fd63845382 100755 (executable)
--- a/scripts/lvm_dump.sh
+++ b/scripts/lvm_dump.sh
@@ -17,7 +17,7 @@
 #           the debugging of lvm issues.
 
 # following external commands are used throughout the script
-# which, echo and test are internal in bash at least
+# echo and test are internal in bash at least
 MKDIR=mkdir # need -p
 TAR=tar # need czf
 RM=rm # need -rf
@@ -43,12 +43,8 @@ die() {
     exit $code
 }
 
-# which should error out if the binary is not executable, although i
-# am not sure we can rely on this
-which $LVM >& /dev/null || die 2 "Fatal: could not find lvm binary '$LVM'"
-test -x `which $LVM` || die 2 "Fatal: lvm binary '$LVM' not executable"
-which $DMSETUP >& /dev/null || die 2 "Fatal: could not find dmsetup binary '$DMSETUP'"
-test -x `which $DMSETUP` || die 2 "Fatal: dmsetup binary '$DMSETUP' not executable"
+"$LVM" version >& /dev/null || die 2 "Could not run lvm binary '$LVM'"
+"$DMSETUP" help >& /dev/null || die 2 "Fatal: could not run dmsetup binary '$DMSETUP'"
 
 function usage {
        echo "$0 [options]"
@@ -166,13 +162,13 @@ fi
 
 myecho "Gathering LVM & device-mapper version info..."
 echo "LVM VERSION:" > $dir/versions
-$LVM lvs --version >> $dir/versions 2>> $log
+"$LVM" lvs --version >> $dir/versions 2>> $log
 echo "DEVICE MAPPER VERSION:" >> $dir/versions
-$DMSETUP --version >> $dir/versions 2>> $log
+"$DMSETUP" --version >> $dir/versions 2>> $log
 echo "KERNEL VERSION:" >> $dir/versions
-$UNAME -a >> $dir/versions 2>> $log
+"$UNAME" -a >> $dir/versions 2>> $log
 echo "DM TARGETS VERSIONS:" >> $dir/versions
-$DMSETUP targets >> $dir/versions 2>> $log
+"$DMSETUP" targets >> $dir/versions 2>> $log
 
 myecho "Gathering dmsetup info..."
 log "$DMSETUP info -c > $dir/dmsetup_info 2>> $log"
@@ -215,9 +211,9 @@ fi
 if test -z "$userdir"; then
        lvm_dump="$dirbase.tgz"
        myecho "Creating report tarball in $HOME/$lvm_dump..."
-       cd $HOME
-       $TAR czf $lvm_dump $dirbase 2>/dev/null
-       $RM -rf $dir
+       cd "$HOME"
+       "$TAR" czf $lvm_dump $dirbase 2>/dev/null
+       "$RM" -rf $dir
 fi
 
 if test "$UID" != "0" && test "$EUID" != "0"; then