summaryrefslogtreecommitdiff
path: root/src/fsck
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-01-04 22:00:46 +0100
committerLennart Poettering <lennart@poettering.net>2013-01-04 23:26:20 +0100
commit32f992a514949b42550b97cadb3bb5499b54ca49 (patch)
treeef36b6445115969dd17a2a965fa8a47ea5171784 /src/fsck
parent660ddc72f65474b4a16bd8a15d8f5cd1860b401b (diff)
fsck: remove distro specific hacks from fsck/quotacheck
Move forcefsck file checks under a HAVE_SYSV_COMPAT #ifdef, and warn if this is used.
Diffstat (limited to 'src/fsck')
-rw-r--r--src/fsck/fsck.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 058f34d64f..f5d38ad261 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -128,11 +128,14 @@ static int parse_proc_cmdline(void) {
arg_skip = true;
else if (startswith(w, "fsck"))
log_warning("Invalid fsck parameter. Ignoring.");
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
- else if (strneq(w, "fastboot", l))
+#ifdef HAVE_SYSV_COMPAT
+ else if (strneq(w, "fastboot", l)) {
+ log_error("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
arg_skip = true;
- else if (strneq(w, "forcefsck", l))
+ } else if (strneq(w, "forcefsck", l)) {
+ log_error("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
arg_force = true;
+ }
#endif
}
@@ -141,11 +144,17 @@ static int parse_proc_cmdline(void) {
}
static void test_files(void) {
- if (access("/fastboot", F_OK) >= 0)
+#ifdef HAVE_SYSV_COMPAT
+ if (access("/fastboot", F_OK) >= 0) {
+ log_error("Please pass 'fsck.mode=skip' on the kernel command line rather than creating /fastboot on the root file system.");
arg_skip = true;
+ }
- if (access("/forcefsck", F_OK) >= 0)
+ if (access("/forcefsck", F_OK) >= 0) {
+ log_error("Please pass 'fsck.mode=force' on the kernel command line rather than creating /forcefsck on the root file system.");
arg_force = true;
+ }
+#endif
if (access("/run/systemd/show-status", F_OK) >= 0 || plymouth_running())
arg_show_progress = true;