From 03956d393876e7950c09f663e1b7e47c76ff44c6 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 19 Jan 2010 17:02:32 +0100
Subject: [PATCH] daemon-util: Fix quoting issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This patch fixes a quoting issue in daemon-util:
$ EXTRA_MASTERD_ARGS=--no-voting /etc/init.d/ganeti restart
[β¦]
* ganeti-masterd...
/β¦/ganeti/daemon-util: line 65: local: `--no-voting': not a valid identifier
The reason was that the generated variables were not quoted properly and
the troublesome line expanded to
βlocal args=$MASTERD_ARGS $EXTRA_MASTERD_ARGSβ instead of the correct
βlocal args="$MASTERD_ARGS $EXTRA_MASTERD_ARGS"β.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
daemons/daemon-util.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
index ab58ac5d6..1e928ebdd 100755
--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -62,7 +62,7 @@ start() {
local ucname=$(tr a-z A-Z <<< ${name#ganeti-})
# Read $<daemon>_ARGS and $EXTRA_<daemon>_ARGS
- eval local args="\$${ucname}_ARGS \$EXTRA_${ucname}_ARGS"
+ eval local args="\"\$${ucname}_ARGS \$EXTRA_${ucname}_ARGS\""
start-stop-daemon --start --quiet --oknodo \
--pidfile $(_daemon_pidfile $name) \
--
GitLab