From f595bce3c0dc220a4643745b8ce9c68cb017464b Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Fri, 17 Nov 2017 11:19:32 +0100 Subject: [PATCH] systemd: Use SYSCONFDIR instead of /etc for 'make install' Suggested-by: Hendrik Brueckner Reviewed-by: Hendrik Brueckner Signed-off-by: Michael Holzheu --- systemd/Makefile | 2 ++ systemd/cpi.service.in | 2 +- systemd/cpuplugd.service.in | 2 +- systemd/mon_fsstatd.service.in | 2 +- systemd/mon_procd.service.in | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/systemd/Makefile b/systemd/Makefile index a1a5485c..1097d9b1 100644 --- a/systemd/Makefile +++ b/systemd/Makefile @@ -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' \ < $< > $@ diff --git a/systemd/cpi.service.in b/systemd/cpi.service.in index 87fbd3fd..24d5246e 100644 --- a/systemd/cpi.service.in +++ b/systemd/cpi.service.in @@ -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 diff --git a/systemd/cpuplugd.service.in b/systemd/cpuplugd.service.in index 65201ed6..6724f2bd 100644 --- a/systemd/cpuplugd.service.in +++ b/systemd/cpuplugd.service.in @@ -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 diff --git a/systemd/mon_fsstatd.service.in b/systemd/mon_fsstatd.service.in index 0e4ae283..117a1e5d 100644 --- a/systemd/mon_fsstatd.service.in +++ b/systemd/mon_fsstatd.service.in @@ -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 diff --git a/systemd/mon_procd.service.in b/systemd/mon_procd.service.in index e0f7a4cd..4358f0cd 100644 --- a/systemd/mon_procd.service.in +++ b/systemd/mon_procd.service.in @@ -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