summaryrefslogtreecommitdiff
path: root/src/fsck/fsck.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-19 16:55:20 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-19 16:55:20 +0200
commit8501384436b410cb9f5929ef6873c59fac6254be (patch)
tree6654fd46ffe9489e8a15a51414a1deeaf026b645 /src/fsck/fsck.c
parent52c611b776c6d17b7aeffb5d9b1b555260b5011b (diff)
stop complaining about unknown kernel cmdline options
Also stop warning about unknown kernel cmdline options in the various tools, not just in PID 1
Diffstat (limited to 'src/fsck/fsck.c')
-rw-r--r--src/fsck/fsck.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index cb2f5734ea..0b572e59f5 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -86,7 +86,8 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
else if (streq(value, "skip"))
arg_skip = true;
else
- log_warning("Invalid fsck.mode= parameter. Ignoring.");
+ log_warning("Invalid fsck.mode= parameter '%s'. Ignoring.", value);
+
} else if (streq(key, "fsck.repair") && value) {
if (streq(value, "preen"))
@@ -96,13 +97,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
else if (streq(value, "no"))
arg_repair = "-n";
else
- log_warning("Invalid fsck.repair= parameter. Ignoring.");
- } else if (startswith(key, "fsck."))
- log_warning("Invalid fsck parameter. Ignoring.");
+ log_warning("Invalid fsck.repair= parameter '%s'. Ignoring.", value);
+ }
+
#ifdef HAVE_SYSV_COMPAT
else if (streq(key, "fastboot") && !value) {
log_warning("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
arg_skip = true;
+
} else if (streq(key, "forcefsck") && !value) {
log_warning("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
arg_force = true;
@@ -113,6 +115,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
}
static void test_files(void) {
+
#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.");