salt/home
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wmstartup: Fix broken service startup logic

Browse Source
This commit is contained in:
Salt 2018-08-27 12:09:03 -05:00
parent c4c2cfdcc9
commit 731560f736
1 changed files with 6 additions and 6 deletions

12
.config/dtfscripts/wmstartup.sh

@ -75,26 +75,26 @@ fi
# Otherwise, populate it with every service # Otherwise, populate it with every service
if [[ "$DTF_SERVICES" == "" ]]; then if [[ "$DTF_SERVICES" == "" ]]; then
dtf_log "Starting all available services" dtf_log "Starting all available services"
for service in $DTF_SEVICES_DIR/*.dtf; do for service in $DTF_SERVICES_DIR/*.dtf; do
export DTF_SERVICES="$DTF_SERVICES $(basename $service)" export DTF_SERVICES="$DTF_SERVICES $(basename "$service")"
done done
else else
dtf_log "Starting a subset of available services" dtf_log "Starting a subset of available services"
fi fi
## Run startup scripts ## Run startup scripts
for service in $DTF_SERVICES_DIR/*.dtf; do for service in $DTF_SERVICES; do
service_full="$DTF_SERVICES_DIR/$service" service_full="$DTF_SERVICES_DIR/$service"
( (
if ! [ -r $service ]; then if ! [ -r "$service_full" ]; then
dtf_log "Service is unreadable or missing: $service" dtf_log "Service is unreadable or missing: $service"
exit 1 exit 1
fi fi
if ! [ -x $service ]; then if ! [ -x "$service_full" ]; then
dtf_log "Service is unexecutable: $service" dtf_log "Service is unexecutable: $service"
exit 1 exit 1
fi fi
source $service source $service_full
if isup && [[ "$service_kill_on_reload" == "true" ]] ; then if isup && [[ "$service_kill_on_reload" == "true" ]] ; then
stop stop
fi fi