From 7e15bd06405387720f861c4765b169c42a5e16e9 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 20 Feb 2014 13:01:07 +0000
Subject: [PATCH] Ubuntu now checks for enabled services

---
 bootstrap-salt.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 6922421..92144c4 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1597,6 +1597,21 @@ install_ubuntu_restart_daemons() {
     done
     return 0
 }
+
+install_ubuntu_check_services() {
+    if [ ! -f /sbin/initctl ]; then
+        return 0
+    fi
+
+    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_upstart salt-$fname || return 1
+    done
+    return 0
+}
 #
 #   End of Ubuntu Install Functions
 #