From 6c253445a34571e0d65cb9f9d0ff6bb4a84604ff Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 2 Mar 2017 15:33:05 +0000
Subject: [PATCH] rework our conditional reload script to handle systemctl
 reload changes

---
 .../base/files/common-scripts/conditional-reload.sh  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/roles/base/files/common-scripts/conditional-reload.sh b/roles/base/files/common-scripts/conditional-reload.sh
index b9aecdb108..988a08b056 100644
--- a/roles/base/files/common-scripts/conditional-reload.sh
+++ b/roles/base/files/common-scripts/conditional-reload.sh
@@ -10,9 +10,15 @@ rpm -q $PACKAGE
 INSTALLED=$?
 
 if [ $INSTALLED -eq 0 ]; then
-    echo "Package $PACKAGE installed.  Attempting reload of $SERVICE."
-    /sbin/service $SERVICE reload
-    exit $?  # Exit with the /sbin/service status code
+    echo "Checking if $SERVICE is running"
+    /sbin/service $SERVICE status >& /dev/null
+    if [ $? == 0 ]; then
+      echo "Package $PACKAGE installed and running.  Attempting reload of $SERVICE."
+      /sbin/service $SERVICE reload
+      exit $?  # Exit with the /sbin/service status code
+    fi
+    echo "Package $PACKAGE is install, but $SERVICE is not running, skipping..."
+    exit 0
 fi
 
 # If the package wasn't installed, then pretend everything is fine.