shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

vgimportclone.sh: double quote

Browse Source
This commit is contained in:
Zdenek Kabelac 2017-06-28 20:05:42 +02:00
parent 96a2e00240
commit 275eeb4631
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/vgimportclone.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# Copyright (C) 2009 Chris Procter All rights reserved.
# Copyright (C) 2009-2015 Red Hat, Inc. All rights reserved.
# Copyright (C) 2009-2017 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@ -30,7 +30,7 @@ LVM="${LVM_BINARY:-lvm}"
die() {
code=$1; shift
echo "Fatal:" "$@" 1>&2
exit $code
exit "$code"
}
"$LVM" version >& /dev/null || die 2 "Could not run lvm binary '$LVM'"
@ -59,9 +59,8 @@ function getvgname {
function checkvalue {
### check return value and error if non zero
if [ $1 -ne 0 ]
then
die $1 "$2, error: $1"
if [ "$1" -ne 0 ]; then
die "$1" "$2, error: $1"
fi
}
@ -86,7 +85,7 @@ function cleanup {
#set to use old lvm.conf
LVM_SYSTEM_DIR=${ORIG_LVM_SYS_DIR}
if [ $KEEP_TMP_LVM_SYSTEM_DIR -eq 1 ]; then
if [ "$KEEP_TMP_LVM_SYSTEM_DIR" -eq 1 ]; then
echo "${SCRIPTNAME}: LVM_SYSTEM_DIR (${TMP_LVM_SYSTEM_DIR}) must be cleaned up manually."
else
"$RM" -rf -- "${TMP_LVM_SYSTEM_DIR}"
@ -200,7 +199,7 @@ for ARG
do
if [ -b "$ARG" ]
then
ln -s "$ARG" ${TMP_LVM_SYSTEM_DIR}/vgimport${DEVNO}
ln -s "$ARG" "${TMP_LVM_SYSTEM_DIR}/vgimport${DEVNO}"
DISKS="${DISKS} ${TMP_LVM_SYSTEM_DIR}/vgimport${DEVNO}"
DEVNO=$((${DEVNO}+1))
else
@ -245,7 +244,7 @@ CMD_CONFIG_LINE="devices { \
use_lvmetad = 0 \
}"
$LVM dumpconfig ${LVM_OPTS} --file ${LVMCONF} --mergedconfig --config "${CMD_CONFIG_LINE}"
$LVM dumpconfig ${LVM_OPTS} --file "${LVMCONF}" --mergedconfig --config "${CMD_CONFIG_LINE}"
checkvalue $? "Failed to generate ${LVMCONF}"
# Only keep TMP_LVM_SYSTEM_DIR if it contains something worth keeping
@ -274,7 +273,7 @@ VGLIST=`${LVM} vgs -o vg_name,vg_exported,vg_missing_pv_count --noheadings --bin
checkvalue $? "Failed to collect VG information"
while read VGNAME VGEXPORTED VGMISSINGPVCOUNT; do
if [ $VGMISSINGPVCOUNT -gt 0 ]; then
if [ "$VGMISSINGPVCOUNT" -gt 0 ]; then
echo "Volume Group ${VGNAME} has unknown PV(s), skipping."
echo "- Were all associated PV(s) supplied as arguments?"
continue
@ -295,7 +294,7 @@ while read VGNAME VGEXPORTED VGMISSINGPVCOUNT; do
NEWVGNAME=`getvgname "${OLDVGS}" "${VGNAME}" "${NEWVG}"`
"$LVM" vgchange ${LVM_OPTS} ${TEST_OPT} --uuid --config 'global{activation=0}' ${VGNAME}
"$LVM" vgchange ${LVM_OPTS} ${TEST_OPT} --uuid --config 'global{activation=0}' "$VGNAME"
checkvalue $? "Unable to change VG uuid for ${VGNAME}"
## if the name isn't going to get changed dont even try.
@ -325,7 +324,7 @@ if [ ${CHANGES_MADE} -eq 1 ]
then
# get global/use_lvmetad config and if set also notify lvmetad about changes
# since we were running LVM commands above with use_lvmetad=0
eval $(${LVM} dumpconfig ${LVM_OPTS} global/use_lvmetad)
eval "$("$LVM" dumpconfig ${LVM_OPTS} global/use_lvmetad)"
if [ "$use_lvmetad" = "1" ]
then
echo "Notifying lvmetad about changes since it was disabled temporarily."