From b51fc639f01ee6194af3e7e944a79accce474fe1 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sun, 2 Sep 2012 17:28:30 -0400
Subject: build-sys: perform autodetection of quota-tools binaries

Use AC_PATH_PROG to try and locate the quotaon and quotacheck binaries,
falling back on hardcoded defaults when they can't be found.
---
 Makefile.am                         |  6 ++++++
 configure.ac                        |  3 +++
 units/.gitignore                    |  1 +
 units/quotaon.service               | 19 -------------------
 units/quotaon.service.in            | 19 +++++++++++++++++++
 units/systemd-quotacheck.service.in |  2 +-
 6 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100644 units/quotaon.service
 create mode 100644 units/quotaon.service.in

diff --git a/Makefile.am b/Makefile.am
index 135d9f8ab1..730db1d5a8 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
 
@@ -2794,6 +2795,9 @@ endif
 EXTRA_DIST += \
 	units/systemd-quotacheck.service.in
 
+nodist_systemunit_DATA += \
+	units/quotaon.service
+
 # ------------------------------------------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
@@ -3427,6 +3431,8 @@ SED_PROCESS = \
 		-e 's,@rootprefix\@,$(rootprefix),g' \
 		-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
 		-e 's,@sushell\@,$(sushell),g' \
+		-e 's,@QUOTAON\@,$(QUOTAON),g' \
+		-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
diff --git a/configure.ac b/configure.ac
index f1b88384f1..b132499556 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 de5117914d..74bff5431f 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@.service
 /systemd-fsck-root.service
 /systemd-tmpfiles-clean.service
diff --git a/units/quotaon.service b/units/quotaon.service
deleted file mode 100644
index caaf12d9f7..0000000000
--- a/units/quotaon.service
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Enable File System Quotas
-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
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/quotaon -aug
diff --git a/units/quotaon.service.in b/units/quotaon.service.in
new file mode 100644
index 0000000000..49a50a7feb
--- /dev/null
+++ b/units/quotaon.service.in
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Enable File System Quotas
+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=@QUOTAON@
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@QUOTAON@ -aug
diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in
index 319a3ced48..f726ea1bcd 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
-- 
cgit v1.2.3-54-g00ecf