Attachment 226058 Details for Bug 256832 – change use of command_interpreter in procname for rc.d files

[patch] change use of command_interpreter in procname for rc.d files

py-salt-procname.patch (text/plain), 2.26 KB, created by ruben on 2021-06-26 10:09:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ruben

Created: 2021-06-26 10:09:41 UTC

Size: 2.26 KB

patch

obsolete

>diff --git a/files/salt_api.in b/files/salt_api.in
>index 75a08f6..22f6a91 100644
>--- a/files/salt_api.in
>+++ b/files/salt_api.in
>@@ -22,7 +22,7 @@ load_rc_config ${name}
> : ${salt_api_enable:=NO}
> 
> command="%%PREFIX%%/bin/salt-api"
>-command_interpreter="%%PYTHON_CMD%%"
>+procname="%%PYTHON_CMD%%"
> required_files="%%PREFIX%%/etc/salt"
> command_args="-c ${required_files} -d"
> 
>diff --git a/files/salt_master.in b/files/salt_master.in
>index 17b7cae..30a632d 100644
>--- a/files/salt_master.in
>+++ b/files/salt_master.in
>@@ -29,7 +29,7 @@ load_rc_config ${name}
> : ${salt_master_eggcache=/tmp}
> 
> command="%%PREFIX%%/bin/salt-master"
>-command_interpreter="%%PYTHON_CMD%%"
>+procname="%%PYTHON_CMD%%"
> required_files="%%PREFIX%%/etc/salt"
> command_args="-c ${required_files} -d"
> pidfile=${salt_master_pidfile}
>diff --git a/files/salt_minion.in b/files/salt_minion.in
>index e25a0ec..bff53e9 100644
>--- a/files/salt_minion.in
>+++ b/files/salt_minion.in
>@@ -29,7 +29,7 @@ load_rc_config ${name}
> : ${salt_minion_eggcache=/tmp}
> 
> command="%%PREFIX%%/bin/salt-minion"
>-command_interpreter="%%PYTHON_CMD%%"
>+procname="%%PYTHON_CMD%%"
> required_files="%%PREFIX%%/etc/salt"
> command_args="-c ${required_files} -d"
> pidfile=${salt_minion_pidfile}
>diff --git a/files/salt_proxy.in b/files/salt_proxy.in
>index 5f93b35..715e14d 100644
>--- a/files/salt_proxy.in
>+++ b/files/salt_proxy.in
>@@ -32,7 +32,7 @@ load_rc_config ${name}
> start_cmd=salt_proxy_start
> 
> command="%%PREFIX%%/bin/salt-proxy"
>-command_interpreter="%%PYTHON_CMD%%"
>+procname="%%PYTHON_CMD%%"
> required_files="%%PREFIX%%/etc/salt"
> command_args="-c ${required_files} -d"
> 
>@@ -50,7 +50,7 @@ salt_proxy_start()
> 
>     for _proxy in ${salt_proxy_list}; do
>         echo "Starting salt-proxy: ${_proxy}"
>-        ${command_interpreter} ${command} --proxyid ${_proxy} ${command_args}
>+        ${procname} ${command} --proxyid ${_proxy} ${command_args}
>     done
> }
> 
>diff --git a/files/salt_syndic.in b/files/salt_syndic.in
>index c948a16..9a96ad4 100644
>--- a/files/salt_syndic.in
>+++ b/files/salt_syndic.in
>@@ -22,7 +22,7 @@ load_rc_config ${name}
> : ${salt_syndic_enable:=NO}
> 
> command="%%PREFIX%%/bin/salt-syndic"
>-command_interpreter="%%PYTHON_CMD%%"
>+procname="%%PYTHON_CMD%%"
> required_files="%%PREFIX%%/etc/salt"
> command_args="-c ${required_files} -d"
>

Actions: View | Diff

Attachments on bug 256832: 226058 | 231577 | 240177