diff options
| author | Charles Celerier <charles@chckyn.org> | 2020-04-23 08:25:13 -0700 |
|---|---|---|
| committer | Anoop C S <anoopcs@cryptolab.net> | 2020-04-30 17:48:59 +0000 |
| commit | b0f41bc56d3867dc4cf2125d8ae87ddff2593229 (patch) | |
| tree | 8538c9c29a7fb960984a5f956d460d14d1d5f713 /extras | |
| parent | 13f3654bc7f5acd8df38b66ab8c28397dacf405e (diff) | |
Use already expanded SYSCONF_DIR in glusterd.service instead of sysconfdir
The generated glusterd.service file included the Automake artifact
`${prefix}` in the EnvironmentFile definition. When an actual value for
`${prefix}` is specified by Automake, this is not properly passed on
to glusterd.service's EnvironmentFile variable since `${prefix}` will
not be expanded once it is no longer in the control of Automake.
Because this artifact was left by the sysconfdir variable, we substitute
it with the SYSCONF_DIR variable that configure.ac expands earlier.
Change-Id: I980b27590c15facb567b153bd57078fed320ff87
Updates: #1135
Signed-off-by: Charles Celerier <charles@chckyn.org>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/systemd/glusterd.service.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/systemd/glusterd.service.in b/extras/systemd/glusterd.service.in index 32542d9f78b..8b25b16ac9f 100644 --- a/extras/systemd/glusterd.service.in +++ b/extras/systemd/glusterd.service.in @@ -10,7 +10,7 @@ Type=forking PIDFile=@localstatedir@/run/glusterd.pid LimitNOFILE=65536 Environment="LOG_LEVEL=INFO" -EnvironmentFile=-@sysconfdir@/sysconfig/glusterd +EnvironmentFile=-@SYSCONF_DIR@/sysconfig/glusterd ExecStart=@prefix@/sbin/glusterd -p @localstatedir@/run/glusterd.pid --log-level $LOG_LEVEL $GLUSTERD_OPTIONS KillMode=process TimeoutSec=300 |