Commit b51fc639 authored by Dave Reisner's avatar Dave Reisner Committed by Lennart Poettering

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.
parent 742a862b
......@@ -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
......
......@@ -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])
......
......@@ -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
......
......@@ -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
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment