From 32f992a514949b42550b97cadb3bb5499b54ca49 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Jan 2013 22:00:46 +0100 Subject: fsck: remove distro specific hacks from fsck/quotacheck Move forcefsck file checks under a HAVE_SYSV_COMPAT #ifdef, and warn if this is used. --- src/quotacheck/quotacheck.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/quotacheck/quotacheck.c') diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c index 05e4971487..e7a4405027 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/quotacheck/quotacheck.c @@ -54,9 +54,11 @@ static int parse_proc_cmdline(void) { arg_skip = true; else if (startswith(w, "quotacheck")) log_warning("Invalid quotacheck parameter. Ignoring."); -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) - else if (strneq(w, "forcequotacheck", l)) +#ifdef HAVE_SYSV_COMPAT + else if (strneq(w, "forcequotacheck", l)) { + log_error("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line."); arg_force = true; + } #endif } @@ -65,10 +67,11 @@ static int parse_proc_cmdline(void) { } static void test_files(void) { -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) - /* This exists only on Fedora, Mandriva or Mageia */ - if (access("/forcequotacheck", F_OK) >= 0) +#ifdef HAVE_SYSV_COMPAT + if (access("/forcequotacheck", F_OK) >= 0) { + log_error("Please pass 'quotacheck.mode=force' on the kernel command line rather than creating /forcequotacheck on the root file system."); arg_force = true; + } #endif } -- cgit v1.2.3-54-g00ecf