chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop complaining about unknown kernel cmdline options
[elogind.git]
/
src
/
fsck
/
fsck.c
diff --git
a/src/fsck/fsck.c
b/src/fsck/fsck.c
index cb2f5734ea069ddf11a0a9ddd17bfd44ce23ddb6..0b572e59f5ab387a11cfb8e6746a093fae7abd8c 100644
(file)
--- 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
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"))
} 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
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;
#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;
} 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) {
}
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.");
#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.");