saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #32106 from jfindlay/suse_patch

Browse source 
update suse master service patch
This commit is contained in:
Mike Place 2016-03-24 15:34:01 -06:00
commit 5efe37ddc8
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/suse/use-forking-daemon.patch
View file

@ -2,16 +2,13 @@ Index: salt-2014.1.8/pkg/salt-master.service
===================================================================
--- salt-2014.1.13.orig/pkg/salt-master.service
+++ salt-2014.1.13/pkg/salt-master.service
@@ -3,8 +3,10 @@ Description=The Salt Master Server
@@ -4,8 +4,7 @@ Description=The Salt Master Server
After=syslog.target network.target
[Service]
LimitNOFILE=16384
-Type=notify
-ExecStart=/usr/bin/salt-master
+Type=forking
+ExecStart=/usr/bin/salt-master --daemon
+# Daemon mode doesn't seem to work reliably without PIDFile
+PIDFile=/var/run/salt-master.pid
[Install]
WantedBy=multi-user.target
-NotifyAccess=all
+Type=simple
ExecStart=/usr/bin/salt-master
KillMode=process