diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 13:42:37 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 14:08:07 +0200 |
| commit | 1e1951d43e06abd0b45b068febe9e390b9a10cdc (patch) | |
| tree | e8c9d523fe24f0f632bd1357ef46db17d24f0c59 | |
| parent | 0bb260e14173412fb677a2ee51180ecd5a009834 (diff) | |
Remove quotaon/quotacheck checks
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/shared/special.h | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 8781f1fe31..695cdb17d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,7 +162,6 @@ AM_CPPFLAGS = \ -DELOGIND_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \ -DX_SERVER=\"$(bindir)/X\" \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ - -DQUOTACHECK=\"$(QUOTACHECK)\" \ -DKEXEC=\"$(KEXEC)\" \ -DLIBDIR=\"$(libdir)\" \ -DROOTLIBDIR=\"$(rootlibdir)\" \ @@ -1004,8 +1003,6 @@ substitutions = \ '|KILL=$(KILL)|' \ '|KMOD=$(KMOD)|' \ '|MKDIR_P=$(MKDIR_P)|' \ - '|QUOTAON=$(QUOTAON)|' \ - '|QUOTACHECK=$(QUOTACHECK)|' \ '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \ '|VARLOGDIR=$(varlogdir)|' \ '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \ diff --git a/configure.ac b/configure.ac index 64d8b213ef..256a27c763 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_INIT([elogind], [elogind], [http://www.freedesktop.org/wiki/Software/elogind]) -AC_CONFIG_SRCDIR([src/core/main.c]) +AC_CONFIG_SRCDIR([src/login/logind.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) @@ -87,9 +87,6 @@ AC_PROG_CC_C99 AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([XSLTPROC], [xsltproc]) -AC_PATH_PROG([QUOTAON], [quotaon], [/usr/sbin/quotaon], [$PATH:/usr/sbin:/sbin]) -AC_PATH_PROG([QUOTACHECK], [quotacheck], [/usr/sbin/quotacheck], [$PATH:/usr/sbin:/sbin]) - AC_PATH_PROG([SETCAP], [setcap], [/usr/sbin/setcap], [$PATH:/usr/sbin:/sbin]) AC_PATH_PROG([KILL], [kill], [/usr/bin/kill], [$PATH:/usr/sbin:/sbin]) @@ -862,14 +859,6 @@ fi AM_CONDITIONAL(ENABLE_BOOTCHART, [test "$have_bootchart" = "yes"]) # ------------------------------------------------------------------------------ -have_quotacheck=no -AC_ARG_ENABLE(quotacheck, AS_HELP_STRING([--disable-quotacheck], [disable quotacheck tools])) -if test "x$enable_quotacheck" != "xno"; then - have_quotacheck=yes -fi -AM_CONDITIONAL(ENABLE_QUOTACHECK, [test "$have_quotacheck" = "yes"]) - -# ------------------------------------------------------------------------------ have_tmpfiles=no AC_ARG_ENABLE(tmpfiles, AS_HELP_STRING([--disable-tmpfiles], [disable tmpfiles support])) if test "x$enable_tmpfiles" != "xno"; then @@ -1427,7 +1416,6 @@ AC_MSG_RESULT([ binfmt: ${have_binfmt} vconsole: ${have_vconsole} bootchart: ${have_bootchart} - quotacheck: ${have_quotacheck} tmpfiles: ${have_tmpfiles} sysusers: ${have_sysusers} firstboot: ${have_firstboot} diff --git a/src/shared/special.h b/src/shared/special.h index e51310eb6d..1bf5c0e35a 100644 --- a/src/shared/special.h +++ b/src/shared/special.h @@ -95,8 +95,6 @@ /* Magic early boot services */ #define SPECIAL_FSCK_SERVICE "systemd-fsck@.service" -#define SPECIAL_QUOTACHECK_SERVICE "systemd-quotacheck.service" -#define SPECIAL_QUOTAON_SERVICE "quotaon.service" #define SPECIAL_REMOUNT_FS_SERVICE "systemd-remount-fs.service" /* Services systemd relies on */ |