From 48f814502606fd0a8caae43e42217794029d073e Mon Sep 17 00:00:00 2001
From: ek9 <dev@ek9.co>
Date: Sun, 8 Jan 2017 16:01:02 +0100
Subject: [PATCH] alpine: fix Syndic not having openRC service +
 daemons_running_alpine

- Fix Syndic based checks when Syndic is installed as when it is
  installed it does not have a daemon on Alpine Linux
- Add `daemons_running_alpine_linux()` function which check if daemons
  are running after install. It's a copy of daemons_running with Syndic
  exluded from the checks.
---
 bootstrap-salt.sh | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b8d7916..71abd79 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4245,6 +4245,9 @@ install_alpine_linux_post() {
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue
 
+        # Skip salt-syndic as there is no service for it on Alpine Linux
+        [ $fname = "syndic" ] && continue
+
         if [ -f /sbin/rc-update ]; then
             /sbin/rc-update add salt-$fname > /dev/null 2>&1
             continue
@@ -4265,6 +4268,9 @@ install_alpine_linux_git_post() {
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue
 
+        # Skip salt-syndic as there is no service for it on Alpine Linux
+        [ $fname = "syndic" ] && continue
+
         if [ -f /sbin/rc-update ]; then
             /sbin/rc-update add salt-$fname > dev/null 2>&1
             continue
@@ -4280,17 +4286,19 @@ install_alpine_linux_restart_daemons() {
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue
 
+        # Skip salt-syndic as there is no service for it on Alpine Linux
+        [ $fname = "syndic" ] && continue
+
         # Skip if not meant to be installed
         [ $fname = "master" ] && [ "$_INSTALL_MASTER" -eq $BS_FALSE ] && continue
         [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
-        [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
         /sbin/rc-service salt-$fname stop > /dev/null 2>&1
         /sbin/rc-service salt-$fname start
     done
 }
 
-install_alpine_check_services() {
+install_alpine_linux_check_services() {
     if [ ! -f /usr/bin/systemctl ]; then
         # Not running systemd!? Don't check!
         return 0
@@ -4300,16 +4308,43 @@ install_alpine_check_services() {
         # Skip salt-api since the service should be opt-in and not necessarily started on boot
         [ $fname = "api" ] && continue
 
+        # Skip salt-syndic as there is no service for it on Alpine Linux
+        [ $fname = "syndic" ] && continue
+
         # Skip if not meant to be installed
         [ $fname = "master" ] && [ "$_INSTALL_MASTER" -eq $BS_FALSE ] && continue
         [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
-        [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
         __check_services_alpine salt-$fname || return 1
     done
 
     return 0
 }
+
+daemons_running_alpine_linux() {
+    [ "$_START_DAEMONS" -eq $BS_FALSE ] && return 0
+
+    FAILED_DAEMONS=0
+    for fname in api master minion syndic; do
+        # Skip salt-api since the service should be opt-in and not necessarily started on boot
+        [ $fname = "api" ] && continue
+
+        # Skip salt-syndic as there is no service for it on Alpine Linux
+        [ $fname = "syndic" ] && continue
+
+        # Skip if not meant to be installed
+        [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
+        [ $fname = "master" ] && [ "$_INSTALL_MASTER" -eq $BS_FALSE ] && continue
+
+        if [ "$(ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then
+            echoerror "salt-$fname was not found running"
+            FAILED_DAEMONS=$((FAILED_DAEMONS + 1))
+        fi
+    done
+
+    return $FAILED_DAEMONS
+}
+
 #
 #   Ended Alpine Linux Install Functions
 #