Revision bb514a22 daemons/daemon-util.in

b/daemons/daemon-util.in
32 32
  ganeti-rapi
33 33
  )
34 34

  
35
if [[ "@CUSTOM_ENABLE_CONFD@" == True ]]; then
35
_confd_enabled() {
36
  [[ "@CUSTOM_ENABLE_CONFD@" == True ]]
37
}
38

  
39
if _confd_enabled; then
36 40
  DAEMONS+=( ganeti-confd )
37 41
fi
38 42

  
......
211 215
  local usergroup=$(_daemon_usergroup $plain_name)
212 216
  local daemonexec=$(_daemon_executable $name)
213 217

  
214
  if [[ "$name" == ganeti-confd &&
215
        "@CUSTOM_ENABLE_CONFD@" == False ]]; then
218
  if [[ "$name" == ganeti-confd ]] && ! _confd_enabled; then
216 219
    echo 'ganeti-confd disabled at build time' >&2
217 220
    return 1
218 221
  fi

Also available in: Unified diff