diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2017-06-29 22:07:49 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2017-06-29 22:23:16 +0200 |
| commit | 191dadc623e6fe07c380744c5a88b29d0f868a30 (patch) | |
| tree | a548597eada76ee889234139b490387ed8db8090 | |
| parent | 99925d0d416dd7664af0fc507480499f44a7915e (diff) | |
| download | lvm2-191dadc623e6fe07c380744c5a88b29d0f868a30.tar.gz | |
clvmd_fix_conf.sh: double quote
| -rw-r--r-- | scripts/clvmd_fix_conf.sh | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/scripts/clvmd_fix_conf.sh b/scripts/clvmd_fix_conf.sh index 079cf30a9..5716d0624 100644 --- a/scripts/clvmd_fix_conf.sh +++ b/scripts/clvmd_fix_conf.sh @@ -63,21 +63,20 @@ have_dir=1 have_library=1 have_global=1 -grep -q '^[[:blank:]]*locking_type[[:blank:]]*=' $LVMCONF +grep -q '^[[:blank:]]*locking_type[[:blank:]]*=' "$LVMCONF" have_type=$? -grep -q '^[[:blank:]]*library_dir[[:blank:]]*=' $LVMCONF +grep -q '^[[:blank:]]*library_dir[[:blank:]]*=' "$LVMCONF" have_dir=$? -grep -q '^[[:blank:]]*locking_library[[:blank:]]*=' $LVMCONF +grep -q '^[[:blank:]]*locking_library[[:blank:]]*=' "$LVMCONF" have_library=$? # Those options are in section "global {" so we must have one if any are present. -if [ "$have_type" = "0" -o "$have_dir" = "0" -o "$have_library" = "0" ] -then +if [ "$have_type" = 0 ] || [ "$have_dir" = 0 ] || [ "$have_library" = 0 ] ; then # See if we can find it... - grep -q '^[[:blank:]]*global[[:blank:]]*{' $LVMCONF + grep -q '^[[:blank:]]*global[[:blank:]]*{' "$LVMCONF" have_global=$? if [ "$have_global" = "1" ] @@ -92,7 +91,7 @@ fi if [ "$have_global" = "1" ] then - cat $LVMCONF - <<EOF > $TMPFILE + cat "$LVMCONF" - <<EOF > "$TMPFILE" global { # Enable locking for cluster LVM locking_type = $locking_type @@ -132,8 +131,8 @@ else SEDCMD="${SEDCMD}\n/global[[:blank:]]*{/a\ \ \ \ locking_library = \"$LIB\"" fi - echo -e $SEDCMD > $SCRIPTFILE - sed <$LVMCONF >$TMPFILE -f $SCRIPTFILE + echo -e "$SEDCMD" > "$SCRIPTFILE" + sed <"$LVMCONF" >"$TMPFILE" -f "$SCRIPTFILE" if [ $? != 0 ] then echo "sed failed, $LVMCONF not updated" @@ -144,19 +143,19 @@ fi # Now we have a suitably editted config file in a temp place, # backup the original and copy our new one into place. -cp $LVMCONF $LVMCONF.nocluster +cp "$LVMCONF" "$LVMCONF.nocluster" if [ $? != 0 ] then echo "failed to backup old config file, $LVMCONF not updated" exit 2 fi -cp $TMPFILE $LVMCONF +cp "$TMPFILE" "$LVMCONF" if [ $? != 0 ] then echo "failed to copy new config file into place, check $LVMCONF is still OK" exit 3 fi -rm -f $SCRIPTFILE $TMPFILE +rm -f "$SCRIPTFILE" "$TMPFILE" |