]> www.infradead.org Git - users/mchehab/rasdaemon.git/commitdiff
Make paths in the systemd services configurable
authorJakub Filak <jfilak@redhat.com>
Fri, 21 Feb 2014 14:54:09 +0000 (15:54 +0100)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 28 Mar 2014 21:23:02 +0000 (18:23 -0300)
The path to a binary depends on configuration, therefore it is better to
not use hard coded strings.

Signed-off-by: Jakub Filak <jfilak@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Makefile.am
misc/ras-mc-ctl.service.in [moved from misc/ras-mc-ctl.service with 75% similarity]
misc/rasdaemon.service.in [moved from misc/rasdaemon.service with 77% similarity]

index c1668b4d939d253b70bcac446f77b40e687cfc3c..0fa615f64a218458107a863956cbd97b1e3cbe98 100644 (file)
@@ -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 \
similarity index 75%
rename from misc/ras-mc-ctl.service
rename to misc/ras-mc-ctl.service.in
index 8a09508be818c94e43bf0b92199fd2bf396b061f..8cb3651bb13edd11d0b786a77669afe4df6b2141 100644 (file)
@@ -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]
similarity index 77%
rename from misc/rasdaemon.service
rename to misc/rasdaemon.service.in
index 36cdef524f13570e62ae150d8dba5e0d8a26ca76..5e1f3757052bc09535d0b16c8321f070c0a80bcb 100644 (file)
@@ -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]