Attachment 235220 Details for Bug 265173 – py-salt-pidfile.patch

[patch] py-salt-pidfile.patch

py-salt-pidfile.patch (text/plain), 2.02 KB, created by Trix Farrar on 2022-07-12 14:55:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Trix Farrar

Created: 2022-07-12 14:55:55 UTC

Size: 2.02 KB

patch

obsolete

>diff -ruw py-salt-orig/Makefile py-salt/Makefile
>--- py-salt-orig/Makefile	2022-07-12 05:05:09.932242767 -0500
>+++ py-salt/Makefile	2022-07-12 05:19:58.347599208 -0500
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	salt
> PORTVERSION=	3004.2
>+PORTREVISION=   1
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruw py-salt-orig/files/salt_master.in py-salt/files/salt_master.in
>--- py-salt-orig/files/salt_master.in	2022-07-12 05:05:09.928184005 -0500
>+++ py-salt/files/salt_master.in	2022-07-12 05:06:53.763130676 -0500
>@@ -25,14 +25,15 @@
> 
> : ${salt_master_enable:=NO}
> : ${salt_master_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
>+: ${salt_master_configdir:=%%PREFIX%%/etc/salt}
> : ${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"
>+required_files=${salt_master_configdir}
> pidfile=${salt_master_pidfile}
>+command_args="-c ${required_files} --pid-file=${pidfile} -d"
> 
> export PATH="${salt_master_paths}"
> export PYTHON_EGG_CACHE="${salt_master_eggcache}"
>diff -ruw py-salt-orig/files/salt_minion.in py-salt/files/salt_minion.in
>--- py-salt-orig/files/salt_minion.in	2022-07-12 05:05:09.929680930 -0500
>+++ py-salt/files/salt_minion.in	2022-07-12 05:08:11.018599911 -0500
>@@ -25,14 +25,15 @@
> 
> : ${salt_minion_enable:=NO}
> : ${salt_minion_paths=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin}
>+: ${salt_minion_configdir:=%%PREFIX%%/etc/salt}
> : ${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"
>+required_files=${salt_minion_configdir}
> pidfile=${salt_minion_pidfile}
>+command_args="-c ${required_files} --pid-file=${pidfile} -d"
> 
> export PATH="${salt_minion_paths}"
> export PYTHON_EGG_CACHE="${salt_minion_eggcache}"

Actions: View | Diff

Attachments on bug 265173: 235220