From 40b68e6e0730059c95da0226c97eb4514476447b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 20 Feb 2014 11:44:34 +0000 Subject: [PATCH] Check for each installed service --- bootstrap-salt.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 22321d5..682e066 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2013,7 +2013,14 @@ install_fedora_restart_daemons() { } install_fedora_check_services() { - __check_services_systemd + for fname in minion master syndic; do + # Skip if not meant to be installed + [ $fname = "minion" ] && [ $_INSTALL_MINION -eq $BS_FALSE ] && continue + [ $fname = "master" ] && [ $_INSTALL_MASTER -eq $BS_FALSE ] && continue + [ $fname = "syndic" ] && [ $_INSTALL_SYNDIC -eq $BS_FALSE ] && continue + __check_services_systemd $fname || return 1 + done + return 0 } # # Ended Fedora Install Functions