Revision 670e954a daemons/daemon-util.in
| b/daemons/daemon-util.in | ||
|---|---|---|
| 39 | 39 |
|
| 40 | 40 |
if _confd_enabled; then |
| 41 | 41 |
DAEMONS+=( ganeti-confd ) |
| 42 |
DAEMONS+=( ganeti-queryd ) |
|
| 42 | 43 |
fi |
| 43 | 44 |
|
| 44 | 45 |
_mond_enabled() {
|
| ... | ... | |
| 52 | 53 |
NODED_ARGS= |
| 53 | 54 |
MASTERD_ARGS= |
| 54 | 55 |
CONFD_ARGS= |
| 56 |
QUERYD_ARGS= |
|
| 55 | 57 |
RAPI_ARGS= |
| 56 | 58 |
MOND_ARGS= |
| 57 | 59 |
|
| ... | ... | |
| 82 | 84 |
confd) |
| 83 | 85 |
echo "@GNTCONFDUSER@:@GNTDAEMONSGROUP@" |
| 84 | 86 |
;; |
| 87 |
queryd) |
|
| 88 |
echo "@GNTQUERYDUSER@:@GNTQUERYDGROUP@" |
|
| 89 |
;; |
|
| 85 | 90 |
rapi) |
| 86 | 91 |
echo "@GNTRAPIUSER@:@GNTRAPIGROUP@" |
| 87 | 92 |
;; |
| ... | ... | |
| 228 | 233 |
local usergroup=$(_daemon_usergroup $plain_name) |
| 229 | 234 |
local daemonexec=$(_daemon_executable $name) |
| 230 | 235 |
|
| 231 |
if [[ "$name" == ganeti-confd ]] && ! _confd_enabled; then |
|
| 236 |
if ( [[ "$name" == ganeti-confd ]] || [[ "$name" == ganeti-queryd ]] ) \ |
|
| 237 |
&& ! _confd_enabled; then |
|
| 232 | 238 |
echo 'ganeti-confd disabled at build time' >&2 |
| 233 | 239 |
return 1 |
| 234 | 240 |
fi |
Also available in: Unified diff