journal: default ImportKernel=no until we make use of structured logging

diff --git a/TODO b/TODO
index b8369c364cb4ee7d3b592bbde0f0e55c776012f2..7cc177f9f311666a77c1204a136b7f095368e504 100644 (file)
--- 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 72d81fbdf454d668173087bb96eed00a4a37c561..f82130b9cfca1056e8ffbde8ac7ab804284c8532 100644 (file)
--- 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 d2e2fcacac25b6480d8dc6bd6cc06037108c6425..8d1b10d270aacbacfb5f2bd0ff053d329acd5c35 100644 (file)
--- 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 3c41923246bd707f73777258001c3cf5749851d7..fc946daaa1fdddbf8b598527c98e3cdb25ef2e2c 100644 (file)
--- 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