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

lvmconf: double quote

Browse Source
This commit is contained in:
Zdenek Kabelac 2017-06-28 17:22:08 +02:00
parent de04e36fda
commit ccdb75adcc
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/lvmconf.sh
View File

@ -51,7 +51,7 @@ function usage
function set_default_use_lvmetad_var
{
eval $(lvm dumpconfig --type default global/use_lvmetad 2>/dev/null)
eval "$(lvm dumpconfig --type default global/use_lvmetad 2>/dev/null)"
if [ "$?" != "0" ]; then
USE_LVMETAD=0
else
@ -325,8 +325,8 @@ else
SEDCMD="${SEDCMD}\n/global[[:blank:]]*{/a\ \ \ \ use_lvmetad = $USE_LVMETAD"
fi
echo -e $SEDCMD > $SCRIPTFILE
sed <$CONFIGFILE >$TMPFILE -f $SCRIPTFILE
echo -e "$SEDCMD" > "$SCRIPTFILE"
sed <"$CONFIGFILE" >"$TMPFILE" -f "$SCRIPTFILE"
if [ $? != 0 ]
then
echo "sed failed, $CONFIGFILE not updated"
@ -337,21 +337,21 @@ fi
# Now we have a suitably editted config file in a temp place,
# backup the original and copy our new one into place.
cp $CONFIGFILE $CONFIGFILE.lvmconfold
cp "$CONFIGFILE" "$CONFIGFILE.lvmconfold"
if [ $? != 0 ]
then
echo "failed to backup old config file, $CONFIGFILE not updated"
exit 2
fi
cp $TMPFILE $CONFIGFILE
cp "$TMPFILE" "$CONFIGFILE"
if [ $? != 0 ]
then
echo "failed to copy new config file into place, check $CONFIGFILE is still OK"
exit 3
fi
rm -f $SCRIPTFILE $TMPFILE
rm -f "$SCRIPTFILE" "$TMPFILE"
function set_service {
local type="$1"
@ -360,42 +360,42 @@ function set_service {
if [ "$type" = "systemd" ]; then
if [ "$action" = "activate" ]; then
for i in $@; do
for i in "$@"; do
unset LoadState
eval $($SYSTEMCTL_BIN show $i -p LoadState 2>/dev/null)
eval "$($SYSTEMCTL_BIN show "$i" -p LoadState 2>/dev/null)"
test "$LoadState" = "loaded" || continue
$SYSTEMCTL_BIN enable $i
$SYSTEMCTL_BIN enable "$i"
if [ "$START_STOP_SERVICES" = "1" ]; then
$SYSTEMCTL_BIN start $i
$SYSTEMCTL_BIN start "$i"
fi
done
elif [ "$action" = "deactivate" ]; then
for i in $@; do
for i in "$@"; do
unset LoadState
eval $($SYSTEMCTL_BIN show $i -p LoadState 2>/dev/null)
eval "$($SYSTEMCTL_BIN show "$i" -p LoadState 2>/dev/null)"
test "$LoadState" = "loaded" || continue
$SYSTEMCTL_BIN disable $i
$SYSTEMCTL_BIN disable "$i"
if [ "$START_STOP_SERVICES" = "1" ]; then
$SYSTEMCTL_BIN stop $i
$SYSTEMCTL_BIN stop "$i"
fi
done
fi
elif [ "$type" = "sysv" ]; then
if [ "$action" = "activate" ]; then
for i in $@; do
$CHKCONFIG_BIN --list $i > /dev/null || continue
$CHKCONFIG_BIN $i on
for i in "$@"; do
$CHKCONFIG_BIN --list "$i" > /dev/null || continue
$CHKCONFIG_BIN "$i" on
if [ "$START_STOP_SERVICES" = "1" ]; then
$SERVICE_BIN $i start
$SERVICE_BIN "$i" start
fi
done
elif [ "$action" = "deactivate" ]; then
for i in $@; do
$CHKCONFIG_BIN --list $i > /dev/null || continue
for i in "$@"; do
$CHKCONFIG_BIN --list "$i" > /dev/null || continue
if [ "$START_STOP_SERVICES" = "1" ]; then
$SERVICE_BIN $i stop
$SERVICE_BIN "$i" stop
fi
$CHKCONFIG_BIN $i off
$CHKCONFIG_BIN "$i" off
done
fi
fi