sysutils/py-salt: Teach the Salt master and minion startup scripts to set

pidfile=.

On a restart this will cause the rc framework to wait for the processes to
exit before trying to start, instead of failing to start because the previous
processes have not gone away yet.

PR:		217154
Approved by:	Christer Edwards <christer.edwards@gmail.com> (maintainer),
		bdrewery (mentor, implicit)

2 files changed, 4 insertions, 0 deletions

diff --git a/sysutils/py-salt/files/salt_master.in b/sysutils/py-salt/files/salt_master.in
index 5f9181a435aa..6ff79eecc366 100644
--- a/sysutils/py-salt/files/salt_master.in
+++ b/sysutils/py-salt/files/salt_master.in
@@ -27,12 +27,14 @@ load_rc_config ${name}
 
 : ${salt_master_enable:=NO}
 : ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
+: ${salt_master_pidfile:=/var/run/salt-master.pid}
 : ${salt_master_eggcache=/tmp}
 
 command="%%PREFIX%%/bin/salt-master"
 command_interpreter="%%PYTHON_CMD%%"
 required_files="%%PREFIX%%/etc/salt"
 command_args="-c ${required_files} -d"
+pidfile=${salt_master_pidfile}
 
 export PATH="${salt_master_paths}"
 export PYTHON_EGG_CACHE="${salt_master_eggcache}"
diff --git a/sysutils/py-salt/files/salt_minion.in b/sysutils/py-salt/files/salt_minion.in
index 189fbd8d5427..8ceab7e8a71d 100644
--- a/sysutils/py-salt/files/salt_minion.in
+++ b/sysutils/py-salt/files/salt_minion.in
@@ -27,12 +27,14 @@ load_rc_config ${name}
 
 : ${salt_minion_enable:=NO}
 : ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
+: ${salt_minion_pidfile:=/var/run/salt-minion.pid}
 : ${salt_minion_eggcache=/tmp}
 
 command="%%PREFIX%%/bin/salt-minion"
 command_interpreter="%%PYTHON_CMD%%"
 required_files="%%PREFIX%%/etc/salt"
 command_args="-c ${required_files} -d"
+pidfile=${salt_minion_pidfile}
 
 export PATH="${salt_minion_paths}"
 export PYTHON_EGG_CACHE="${salt_minion_eggcache}"