From a34d8cc02c6c05fcb684a99b5f0ee1aa9c01960a Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 11 Mar 2010 17:42:19 +0100
Subject: [PATCH] daemon-util: Generate daemon path in separate function
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
daemons/daemon-util.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
index 977913787..4d47bd937 100755
--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -46,6 +46,10 @@ _daemon_pidfile() {
echo "@LOCALSTATEDIR@/run/ganeti/$1.pid"
}
+_daemon_executable() {
+ echo "@PREFIX@/sbin/$1"
+}
+
# Checks whether the local machine is part of a cluster
check_config() {
local server_pem=@LOCALSTATEDIR@/lib/ganeti/server.pem
@@ -147,7 +151,7 @@ start() {
start-stop-daemon --start --quiet --oknodo \
--pidfile $(_daemon_pidfile $name) \
- --startas "@PREFIX@/sbin/$name" \
+ --startas $(_daemon_executable $name) \
-- $args "$@"
}
--
GitLab