From f4bad2bd2abe8ae260a99a5336145d11efe79892 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 3 Jul 2012 14:07:10 +0200 Subject: [PATCH] journal: default ImportKernel=no until we make use of structured logging --- TODO | 1 - man/journald.conf.xml | 2 +- src/journal/journald.c | 1 - src/journal/journald.conf | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index b8369c364..7cc177f9f 100644 --- a/TODO +++ b/TODO @@ -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 72d81fbdf..f82130b9c 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -276,7 +276,7 @@ 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 d2e2fcaca..8d1b10d27 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 3c4192324..fc946daaa 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 -- 2.30.2