errors: refer to systemctl status when useful

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 88ba09d43e51a1355d3cbe00620e7bc22ae19dd1..7dad015e3034ed86ad23508d1270185b5c86162b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -333,7 +333,7 @@ static int parse_proc_cmdline_word(const char *word) {
 #ifdef HAVE_SYSV_COMPAT
                          "systemd.sysv_console=0|1                 Connect output of SysV scripts to console\n"
 #endif
-                         "systemd.log_target=console|kmsg|syslog|syslog-org-kmsg|null\n"
+                         "systemd.log_target=console|kmsg|syslog|syslog-or-kmsg|null\n"
                          "                                         Log target\n"
                          "systemd.log_level=LEVEL                  Log level\n"
                          "systemd.log_color=0|1                    Highlight important log messages\n"
@@ -973,6 +973,13 @@ int main(int argc, char *argv[]) {
                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
                arg_running_as == MANAGER_SYSTEM);
 
+        /* Unset some environment variables passed in from the kernel
+         * that don't really make sense for us. */
+        if (arg_running_as == MANAGER_SYSTEM) {
+                unsetenv("HOME");
+                unsetenv("TERM");
+        }
+
         /* Move out of the way, so that we won't block unmounts */
         assert_se(chdir("/")  == 0);