kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: Use SYSCONFDIR instead of /etc for 'make install'

Browse Source 
Suggested-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
This commit is contained in:
Michael Holzheu
2017-11-17 11:19:32 +01:00
parent 0768fbbb20
commit f595bce3c0
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
systemd/Makefile
View File

@@ -35,10 +35,12 @@ clean:
real_usrbin_dir=$(USRBINDIR); \
real_usrsbin_dir=$(USRSBINDIR); \
real_toolslib_dir=$(TOOLS_LIBDIR); \
real_sysconf_dir=$(SYSCONFDIR); \
$(SED) -e "s#@bin_path@#$$real_bin_dir#g" \
-e "s#@usrbin_path@#$$real_usrbin_dir#g" \
-e "s#@usrsbin_path@#$$real_usrsbin_dir#g" \
-e "s#@toolslib_path@#$$real_toolslib_dir#g" \
-e "s#@sysconf_path@#$$real_sysconf_dir#g" \
-e 's#@S390_TOOLS_RELEASE@#$(S390_TOOLS_RELEASE)#g' \
< $< > $@

2
systemd/cpi.service.in
View File

@@ -19,7 +19,7 @@ Type=oneshot
# Specify a file with the environment variables using the EnvironmentFile=
# service property.
#
EnvironmentFile=/etc/sysconfig/cpi
EnvironmentFile=@sysconf_path@/sysconfig/cpi
#
# Alternatively, you can specify the environment variables directly,
# using the Environment= service properties, which can be overridden by

2
systemd/cpuplugd.service.in
View File

@@ -13,7 +13,7 @@ Documentation=man:cpuplugd(8) man:cpuplugd.conf(5)
After=remote-fs.target
[Service]
ExecStart=@usrsbin_path@/cpuplugd -f -c /etc/cpuplugd.conf
ExecStart=@usrsbin_path@/cpuplugd -f -c @sysconf_path@/cpuplugd.conf
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Type=simple

2
systemd/mon_fsstatd.service.in
View File

@@ -18,7 +18,7 @@ After=remote-fs.target
# Specify a file with the environment variables using the EnvironmentFile=
# service property.
#
EnvironmentFile=/etc/sysconfig/mon_fsstatd
EnvironmentFile=@sysconf_path@/sysconfig/mon_fsstatd
#
# Alternatively, you can specify the environment variables directly,
# using the Environment= service property, which can be overridden by

2
systemd/mon_procd.service.in
View File

@@ -18,7 +18,7 @@ After=remote-fs.target
# Specify a file with the environment variables using the EnvironmentFile=
# service property.
#
EnvironmentFile=/etc/sysconfig/mon_procd
EnvironmentFile=@sysconf_path@/sysconfig/mon_procd
#
# Alternatively, you can specify the environment variables directly,
# using the Environment= service property, which can be overridden by