summaryrefslogtreecommitdiff
path: root/src/core/main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-11 20:08:08 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-11 20:08:08 +0200
commitc1dc6153c9426d98ddbcd8b5077f397f18ff1da7 (patch)
tree6bb0a7586c9f8877666676128ba2ff087118b59f /src/core/main.c
parent79c1afc67f973eaece8f1b7016e016bb33c256a7 (diff)
log: never ever log to syslog from PID 1, log to the journal again
We don't support journal-less systems anyway, so let's avoid the confusion.
Diffstat (limited to 'src/core/main.c')
-rw-r--r--src/core/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c
index d2104cb551..f33b78d375 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1018,7 +1018,7 @@ static int help(void) {
" --crash-shell[=0|1] Run shell on crash\n"
" --confirm-spawn[=0|1] Ask for confirmation when spawning processes\n"
" --show-status[=0|1] Show status updates on the console during bootup\n"
- " --log-target=TARGET Set log target (console, journal, syslog, kmsg, journal-or-kmsg, syslog-or-kmsg, null)\n"
+ " --log-target=TARGET Set log target (console, journal, kmsg, journal-or-kmsg, null)\n"
" --log-level=LEVEL Set log level (debug, info, notice, warning, err, crit, alert, emerg)\n"
" --log-color[=0|1] Highlight important log messages\n"
" --log-location[=0|1] Include code location in log messages\n"
@@ -1328,6 +1328,7 @@ int main(int argc, char *argv[]) {
saved_argc = argc;
log_show_color(isatty(STDERR_FILENO) > 0);
+ log_set_upgrade_syslog_to_journal(true);
/* Disable the umask logic */
if (getpid() == 1)