File 0041-add-try-restart-to-fix-autorestarting-on-S... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File 0041-add-try-restart-to-fix-autorestarting-on-SUSE-system.patch of Package salt (Revision d79fc379c5a4607210ced3ade9feb8b0)

Currently displaying revision d79fc379c5a4607210ced3ade9feb8b0 , Show latest

From 7111c41301ff78d313227f62b82a0b183ef419a5 Mon Sep 17 00:00:00 2001
From: Michael Calmer <mc@suse.de>
Date: Tue, 20 Dec 2016 18:17:51 +0100
Subject: [PATCH 41/41] add try-restart to fix autorestarting on SUSE systems

---
 pkg/rpm/salt-api     | 4 ++--
 pkg/suse/salt-master | 4 ++--
 pkg/suse/salt-minion | 4 ++--
 pkg/suse/salt-syndic | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/rpm/salt-api b/pkg/rpm/salt-api
index 1a5735d..70a20b7 100755
--- a/pkg/rpm/salt-api
+++ b/pkg/rpm/salt-api
@@ -139,7 +139,7 @@ case "$1" in
             RETVAL=$?
         fi
         ;;
-    condrestart)
+    condrestart|try-restart)
         [ -f $LOCKFILE ] && restart || :
         ;;
     reload)
@@ -147,7 +147,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
         exit 1
         ;;
 esac
diff --git a/pkg/suse/salt-master b/pkg/suse/salt-master
index 07daf4c..54dfe82 100644
--- a/pkg/suse/salt-master
+++ b/pkg/suse/salt-master
@@ -122,7 +122,7 @@ case "$1" in
             RETVAL=$?
         fi
         ;;
-    condrestart)
+    condrestart|try-restart)
         [ -f $LOCKFILE ] && restart || :
         ;;
     reload)
@@ -130,7 +130,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
         exit 1
         ;;
 esac
diff --git a/pkg/suse/salt-minion b/pkg/suse/salt-minion
index 729ed71..89b9fc2 100644
--- a/pkg/suse/salt-minion
+++ b/pkg/suse/salt-minion
@@ -129,7 +129,7 @@ case "$1" in
             RETVAL=$?
         fi
         ;;
-    condrestart)
+    condrestart|try-restart)
         [ -f $LOCKFILE ] && restart || :
         ;;
     reload)
@@ -137,7 +137,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
         exit 1
         ;;
 esac
diff --git a/pkg/suse/salt-syndic b/pkg/suse/salt-syndic
index e043b85..03a5752 100644
--- a/pkg/suse/salt-syndic
+++ b/pkg/suse/salt-syndic
@@ -123,7 +123,7 @@ case "$1" in
             RETVAL=$?
         fi
         ;;
-    condrestart)
+    condrestart|try-restart)
         [ -f $LOCKFILE ] && restart || :
         ;;
     reload)
@@ -131,7 +131,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
         exit 1
         ;;
 esac
-- 
2.10.2

Places

File 0041-add-try-restart-to-fix-autorestarting-on-SUSE-system.patch of Package salt (Revision d79fc379c5a4607210ced3ade9feb8b0)

Places