summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-06-22 01:35:52 +0200
committerLennart Poettering <lennart@poettering.net>2012-06-22 01:35:52 +0200
commitc66e7bc7a19c068ca1c414f2f8bd5dc13c20907f (patch)
tree7acc7a230af7f42370872cb4b269c4ca2d40d7db /src/core
parent8b38f3cc3eb73adf9536cb73d0f319e60d42ea0c (diff)
man: document all kernel command line options we understand
Diffstat (limited to 'src/core')
-rw-r--r--src/core/main.c5
1 files changed, 3 insertions, 2 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 */