Revision 6e3bf290 daemons/daemon-util.in
b/daemons/daemon-util.in | ||
---|---|---|
20 | 20 |
|
21 | 21 |
set -e |
22 | 22 |
|
23 |
readonly defaults_file="${GANETI_ROOTDIR}@SYSCONFDIR@/default/ganeti" |
|
24 |
readonly localstatedir="${GANETI_ROOTDIR}@LOCALSTATEDIR@" |
|
23 |
@SHELL_ENV_INIT@ |
|
24 |
|
|
25 |
readonly defaults_file="$SYSCONFDIR/default/ganeti" |
|
25 | 26 |
|
26 | 27 |
# This is a list of all daemons and the order in which they're started. The |
27 | 28 |
# order is important as there are dependencies between them. On shutdown, |
... | ... | |
57 | 58 |
} |
58 | 59 |
|
59 | 60 |
_daemon_pidfile() { |
60 |
echo "$localstatedir/run/ganeti/$1.pid"
|
|
61 |
echo "$RUN_DIR/$1.pid"
|
|
61 | 62 |
} |
62 | 63 |
|
63 | 64 |
_daemon_executable() { |
... | ... | |
86 | 87 |
|
87 | 88 |
# Checks whether the local machine is part of a cluster |
88 | 89 |
check_config() { |
89 |
local server_pem=$localstatedir/lib/ganeti/server.pem
|
|
90 |
local server_pem=$DATA_DIR/server.pem
|
|
90 | 91 |
local fname |
91 | 92 |
|
92 | 93 |
for fname in $server_pem; do |
Also available in: Unified diff