[systemd-devel] [PATCHv2] perform autodetection of quota-tools binaries

[Dave Reisner]

Use AC_PATH_PROG to try and locate the quotaon and quotacheck binaries,
falling back on hardcoded defaults when they can't be found.
---
Sorry, previous patch did not pass distcheck because of a missing addition
to nodist.

 Makefile.am                                   | 6 ++++++
 configure.ac                                  | 3 +++
 units/.gitignore                              | 1 +
 units/{quotaon.service => quotaon.service.in} | 4 ++--
 units/systemd-quotacheck.service.in           | 2 +-
 5 files changed, 13 insertions(+), 3 deletions(-)
 rename units/{quotaon.service => quotaon.service.in} (90%)

diff --git a/Makefile.am b/Makefile.am
index e5ace9b..c110150 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -382,6 +382,7 @@ EXTRA_DIST += \
 	units/debug-shell.service.in \
 	units/systemd-hibernate.service.in \
 	units/systemd-suspend.service.in \
+	units/quotaon.service.in \
 	introspect.awk \
 	man/custom-html.xsl
 
@@ -2775,6 +2776,9 @@ endif
 EXTRA_DIST += \
 	units/systemd-quotacheck.service.in
 
+nodist_systemunit_DATA += \
+	units/quotaon.service
+
 # ------------------------------------------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
@@ -3408,6 +3412,8 @@ SED_PROCESS = \
 		-e 's, at rootprefix\@,$(rootprefix),g' \
 		-e 's, at udevlibexecdir\@,$(udevlibexecdir),g' \
 		-e 's, at sushell\@,$(sushell),g' \
+		-e 's, at QUOTAON\@,$(QUOTAON),g' \
+		-e 's, at QUOTACHECK\@,$(QUOTACHECK),g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
diff --git a/configure.ac b/configure.ac
index 4bafbfb..eae752c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,9 @@ AC_PROG_GCC_TRADITIONAL
 AC_PATH_PROG([M4], [m4])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
+AC_PATH_PROG([QUOTAON], [quotaon], [/sbin/quotaon])
+AC_PATH_PROG([QUOTACHECK], [quotacheck], [/sbin/quotacheck])
+
 # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
 m4_ifdef([GTK_DOC_CHECK], [
 GTK_DOC_CHECK([1.18],[--flavour no-tmpl])
diff --git a/units/.gitignore b/units/.gitignore
index de51179..74bff54 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -14,6 +14,7 @@
 /rescue.service
 /systemd-ask-password-wall.service
 /systemd-quotacheck.service
+/quotaon.service
 /systemd-fsck at .service
 /systemd-fsck-root.service
 /systemd-tmpfiles-clean.service
diff --git a/units/quotaon.service b/units/quotaon.service.in
similarity index 90%
rename from units/quotaon.service
rename to units/quotaon.service.in
index caaf12d..49a50a7 100644
--- a/units/quotaon.service
+++ b/units/quotaon.service.in
@@ -11,9 +11,9 @@ Documentation=man:quotaon(8)
 DefaultDependencies=no
 After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-quotacheck.service
 Before=local-fs.target shutdown.target
-ConditionPathExists=/sbin/quotaon
+ConditionPathExists=@QUOTAON@
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/sbin/quotaon -aug
+ExecStart=@QUOTAON@ -aug
diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in
index 319a3ce..f726ea1 100644
--- a/units/systemd-quotacheck.service.in
+++ b/units/systemd-quotacheck.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-quotacheck.service(8)
 DefaultDependencies=no
 After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
 Before=local-fs.target shutdown.target
-ConditionPathExists=/sbin/quotacheck
+ConditionPathExists=@QUOTACHECK@
 
 [Service]
 Type=oneshot
-- 
1.7.12