diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/main.c | 5 | ||||
| -rw-r--r-- | src/journal/journald.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/core/main.c b/src/core/main.c index 5cd012e957..e6a90e0133 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -397,14 +397,15 @@ static int parse_proc_cmdline_word(const char *word) { "systemd.default_standard_output=null|tty|syslog|syslog+console|kmsg|kmsg+console|journal|journal+console\n" " Set default log output for services\n" "systemd.default_standard_error=null|tty|syslog|syslog+console|kmsg|kmsg+console|journal|journal+console\n" - " Set default log error output for services\n"); + " Set default log error output for services\n" + "systemd.setenv=ASSIGNMENT Set an environment variable for all spawned processes\n"); } else if (streq(word, "quiet")) { arg_show_status = false; #ifdef HAVE_SYSV_COMPAT arg_sysv_console = false; #endif - } else { + } else if (!in_initrd()) { unsigned i; /* SysV compatibility */ diff --git a/src/journal/journald.c b/src/journal/journald.c index 5c6c4cae9e..98a155bdef 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -2630,19 +2630,19 @@ static int server_parse_proc_cmdline(Server *s) { goto finish; } - if (startswith(word, "systemd_journald.forward_to_syslog=")) { + if (startswith(word, "systemd.journald.forward_to_syslog=")) { r = parse_boolean(word + 35); if (r < 0) log_warning("Failed to parse forward to syslog switch %s. Ignoring.", word + 35); else s->forward_to_syslog = r; - } else if (startswith(word, "systemd_journald.forward_to_kmsg=")) { + } else if (startswith(word, "systemd.journald.forward_to_kmsg=")) { r = parse_boolean(word + 33); if (r < 0) log_warning("Failed to parse forward to kmsg switch %s. Ignoring.", word + 33); else s->forward_to_kmsg = r; - } else if (startswith(word, "systemd_journald.forward_to_console=")) { + } else if (startswith(word, "systemd.journald.forward_to_console=")) { r = parse_boolean(word + 36); if (r < 0) log_warning("Failed to parse forward to console switch %s. Ignoring.", word + 36); |