diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-07-03 14:07:10 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-07-03 14:07:10 +0200 |
| commit | f4bad2bd2abe8ae260a99a5336145d11efe79892 (patch) | |
| tree | d6f133950bae4b792323c28ecb04eb4119a559ea | |
| parent | 746e436dc54510fe142f5046a557e5006bc7e2aa (diff) | |
| download | systemd-f4bad2bd2abe8ae260a99a5336145d11efe79892.tar.gz | |
journal: default ImportKernel=no until we make use of structured logging
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | man/journald.conf.xml | 2 | ||||
| -rw-r--r-- | src/journal/journald.c | 1 | ||||
| -rw-r--r-- | src/journal/journald.conf | 2 |
4 files changed, 2 insertions, 4 deletions
@@ -38,7 +38,6 @@ Features: * Document: - PID 1 D-Bus API - - Update Syslog Interface docs - Journal C API manual pages * wiki: document logind's PreparingForShutdown, PreparingForSleep diff --git a/man/journald.conf.xml b/man/journald.conf.xml index 72d81fbdf4..f82130b9cf 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -276,7 +276,7 @@ <listitem><para>Controls whether kernel log messages shall be stored in the journal. Takes a boolean argument - and defaults to enabled. Note that + and defaults to disabled. Note that currently only one userspace service can read kernel messages at a time, which means that kernel log message diff --git a/src/journal/journald.c b/src/journal/journald.c index d2e2fcacac..8d1b10d270 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -2727,7 +2727,6 @@ static int server_init(Server *s) { s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST; s->forward_to_syslog = true; - s->import_proc_kmsg = true; s->max_level_store = LOG_DEBUG; s->max_level_syslog = LOG_DEBUG; diff --git a/src/journal/journald.conf b/src/journal/journald.conf index 3c41923246..fc946daaa1 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -22,7 +22,7 @@ #ForwardToSyslog=yes #ForwardToKMsg=no #ForwardToConsole=no -#ImportKernel=yes +#ImportKernel=no #TTYPath=/dev/console #MaxLevelStore=debug #MaxLevelSyslog=debug |