File 0026-fix-status-handling-in-sysv-init-scripts.p... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File 0026-fix-status-handling-in-sysv-init-scripts.patch of Package salt (Revision 4a3a07a62b699ec4a84e2fbebc324744)

Currently displaying revision 4a3a07a62b699ec4a84e2fbebc324744 , Show latest

From ec2b026fe3a09a26e5f7f2be7710e014902b6ec4 Mon Sep 17 00:00:00 2001
From: Michael Calmer <mc@suse.de>
Date: Sun, 6 Nov 2016 18:11:15 +0100
Subject: [PATCH 26/38] fix status handling in sysv init scripts

---
 pkg/rpm/salt-api     | 1 +
 pkg/suse/salt-master | 1 +
 pkg/suse/salt-minion | 2 ++
 pkg/suse/salt-syndic | 1 +
 4 files changed, 5 insertions(+)

diff --git a/pkg/rpm/salt-api b/pkg/rpm/salt-api
index b640a43..1a5735d 100755
--- a/pkg/rpm/salt-api
+++ b/pkg/rpm/salt-api
@@ -125,6 +125,7 @@ case "$1" in
             echo -n "Checking for service salt-api "
             checkproc $SALTAPI
             rc_status -v
+            RETVAL=$?
         elif [ -f $DEBIAN_VERSION ]; then
             if [ -f $LOCKFILE ]; then
                 RETVAL=0
diff --git a/pkg/suse/salt-master b/pkg/suse/salt-master
index 35f5e3c..07daf4c 100644
--- a/pkg/suse/salt-master
+++ b/pkg/suse/salt-master
@@ -108,6 +108,7 @@ case "$1" in
             echo -n "Checking for service salt-master "
             checkproc $SALTMASTER
             rc_status -v
+            RETVAL=$?
         elif [ -f $DEBIAN_VERSION ]; then
             if [ -f $LOCKFILE ]; then
                 RETVAL=0
diff --git a/pkg/suse/salt-minion b/pkg/suse/salt-minion
index 28cf32c..729ed71 100644
--- a/pkg/suse/salt-minion
+++ b/pkg/suse/salt-minion
@@ -57,6 +57,7 @@ start() {
     if [ -f $SUSE_RELEASE ]; then
         startproc -p /var/run/$SERVICE.pid $SALTMINION -d $MINION_ARGS
         rc_status -v
+        RETVAL=$?
     elif [ -e $DEBIAN_VERSION ]; then
         if [ -f $LOCKFILE ]; then
             echo -n "already started, lock file found"
@@ -114,6 +115,7 @@ case "$1" in
             echo -n "Checking for service salt-minion "
             checkproc $SALTMINION
             rc_status -v
+            RETVAL=$?
         elif [ -f $DEBIAN_VERSION ]; then
             if [ -f $LOCKFILE ]; then
                 RETVAL=0
diff --git a/pkg/suse/salt-syndic b/pkg/suse/salt-syndic
index 1a3944f..e043b85 100644
--- a/pkg/suse/salt-syndic
+++ b/pkg/suse/salt-syndic
@@ -109,6 +109,7 @@ case "$1" in
             echo -n "Checking for service salt-syndic "
             checkproc $SALTSYNDIC
             rc_status -v
+            RETVAL=$?
         elif [ -f $DEBIAN_VERSION ]; then
             if [ -f $LOCKFILE ]; then
                 RETVAL=0
-- 
2.10.2

Places

File 0026-fix-status-handling-in-sysv-init-scripts.patch of Package salt (Revision 4a3a07a62b699ec4a84e2fbebc324744)

Places