From aab8e23975cf2f3ef919e7476ac9d20ccb256f63 Mon Sep 17 00:00:00 2001
From: Thayne Harbaugh <tharbaug@adobe.com>
Date: Thu, 28 Jul 2016 12:12:45 -0600
Subject: [PATCH] Minor tweaks/improvements to the salt-minion SysV init
 script.

* Test "reload" before probing minion configuration
* change indent
---
 pkg/rpm/salt-minion | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/rpm/salt-minion b/pkg/rpm/salt-minion
index 547be5d3e6..1bf308aadb 100755
--- a/pkg/rpm/salt-minion
+++ b/pkg/rpm/salt-minion
@@ -252,11 +252,15 @@ main() {
 
     # Pre-filter for unhandled commands
     case "$1" in
-        (start|stop|status|restart|condrestart|try-restart|reload) ;;
+        (start|stop|status|restart|condrestart|try-restart) ;;
+        (reload)
+            echo "Can't reload $SERVICE - you must restart it"
+            exit 3
+            ;;
         (*)
-        echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
-        exit 2
-        ;;
+            echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
+            exit 2
+            ;;
     esac
 
     while read MINION_USER CONFIG_DIR; do
@@ -300,10 +304,6 @@ main() {
                     start || RETVAL=$?
                 fi
                 ;;
-            (reload)
-                echo "Can't reload $SERVICE configuration - you must restart it"
-                RETVAL=3
-                ;;
             (*)
                 echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
                 RETVAL=2