From: Jakub Filak Date: Fri, 21 Feb 2014 14:54:09 +0000 (+0100) Subject: Make paths in the systemd services configurable X-Git-Tag: v0.5.1~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4bfa45f56e1500f1cfc8de3fd8d1228b11011e95;p=users%2Fmchehab%2Frasdaemon.git Make paths in the systemd services configurable The path to a binary depends on configuration, therefore it is better to not use hard coded strings. Signed-off-by: Jakub Filak Signed-off-by: Mauro Carvalho Chehab --- diff --git a/Makefile.am b/Makefile.am index c1668b4..0fa615f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,19 @@ ACLOCAL_AMFLAGS=-I m4 SUBDIRS = libtrace util man -EXTRA_DIST = misc/rasdaemon.service misc/ras-mc-ctl.service +SYSTEMD_SERVICES_IN = misc/rasdaemon.service.in misc/ras-mc-ctl.service.in +SYSTEMD_SERVICES = $(SYSTEMD_SERVICES_IN:.service.in=.service) +EXTRA_DIST = $(SYSTEMD_SERVICES_IN) + +# This rule is needed because \@sbindir\@ is expanded to \${exec_prefix\}/sbin +# during ./configure phase, therefore it is not possible to add .service.in +# files to AC_CONFIG_FILES in configure.ac +SUFFIXES = .service.in .service +.service.in.service: + sed -e s,\@sbindir\@,$(sbindir),g $< > $@ + +# This rule is needed because the service files must be generated on target +# system after ./configure phase +all-local: $(SYSTEMD_SERVICES) sbin_PROGRAMS = rasdaemon rasdaemon_SOURCES = rasdaemon.c ras-events.c ras-mc-handler.c \ diff --git a/misc/ras-mc-ctl.service b/misc/ras-mc-ctl.service.in similarity index 75% rename from misc/ras-mc-ctl.service rename to misc/ras-mc-ctl.service.in index 8a09508..8cb3651 100644 --- a/misc/ras-mc-ctl.service +++ b/misc/ras-mc-ctl.service.in @@ -3,7 +3,7 @@ Description=Initialize EDAC v3.0.0 Drivers For Machine Hardware [Service] Type=oneshot -ExecStart=/usr/sbin/ras-mc-ctl --register-labels +ExecStart=@sbindir@/ras-mc-ctl --register-labels RemainAfterExit=yes [Install] diff --git a/misc/rasdaemon.service b/misc/rasdaemon.service.in similarity index 77% rename from misc/rasdaemon.service rename to misc/rasdaemon.service.in index 36cdef5..5e1f375 100644 --- a/misc/rasdaemon.service +++ b/misc/rasdaemon.service.in @@ -3,7 +3,7 @@ Description=RAS daemon to log the RAS events After=syslog.target [Service] -ExecStart=/usr/local/sbin/rasdaemon -f +ExecStart=@sbindir@/rasdaemon -f Restart=on-abort [Install]