picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stop complaining about unknown kernel cmdline options 

Also stop warning about unknown kernel cmdline options in the various
tools, not just in PID 1
This commit is contained in:
Lennart Poettering 2014-06-19 16:55:20 +02:00
parent 52c611b776
commit 8501384436
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cryptsetup/cryptsetup-generator.c
View File

@ -291,8 +291,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
if (!arg_keyfile)
return log_oom();
} else if (startswith(key, "luks.") || startswith(key, "rd.luks."))
log_warning("Unknown kernel switch %s. Ignoring.", key);
}
return 0;
}

11
src/fsck/fsck.c
View File

@ -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.");

2
src/fstab-generator/fstab-generator.c
View File

@ -486,8 +486,6 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
arg_root_rw = true;
else if (streq(key, "ro") && !value)
arg_root_rw = false;
else if (startswith(key, "fstab.") || startswith(key, "rd.fstab."))
log_warning("Unknown kernel switch %s. Ignoring.", key);
return 0;
}

2
src/gpt-auto-generator/gpt-auto-generator.c
View File

@ -695,8 +695,6 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
arg_root_rw = true;
else if (streq(key, "ro") && !value)
arg_root_rw = false;
else if (startswith(key, "systemd.gpt-auto.") || startswith(key, "rd.systemd.gpt-auto."))
log_warning("Unknown kernel switch %s. Ignoring.", key);
return 0;
}

6
src/quotacheck/quotacheck.c
View File

@ -42,10 +42,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
else if (streq(value, "skip"))
arg_skip = true;
else
log_warning("Invalid quotacheck.mode= parameter. Ignoring.");
log_warning("Invalid quotacheck.mode= parameter '%s'. Ignoring.", value);
}
} else if (startswith(key, "quotacheck."))
log_warning("Invalid quotacheck parameter. Ignoring.");
#ifdef HAVE_SYSV_COMPAT
else if (streq(key, "forcequotacheck") && !value) {
log_warning("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line.");
@ -57,6 +56,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
}
static void test_files(void) {
#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.");