daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
923a60
From 1b8d3a9c51d5584b6f6e394592a83b43cfbc693d Mon Sep 17 00:00:00 2001
923a60
From: Lukas Nykryn <lnykryn@redhat.com>
923a60
Date: Mon, 25 Jan 2016 14:03:47 +0100
923a60
Subject: [PATCH] Revert "journald: turn ForwardToSyslog= off by default"
923a60
923a60
This reverts commit 46b131574fdd7d77c15a0919ca9010cad7aa6ac7.
923a60
923a60
rhel-only
923a60
923a60
Resolves: #1285642
923a60
---
923a60
 man/journald.conf.xml         | 2 +-
923a60
 src/journal/journald-server.c | 1 +
923a60
 src/journal/journald.conf     | 2 +-
923a60
 3 files changed, 3 insertions(+), 2 deletions(-)
923a60
923a60
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
923a60
index 2cbe58bc15..c4f71e8873 100644
923a60
--- a/man/journald.conf.xml
923a60
+++ b/man/journald.conf.xml
923a60
@@ -302,7 +302,7 @@
923a60
         These options take boolean arguments. If forwarding to syslog
923a60
         is enabled but nothing reads messages from the socket,
923a60
         forwarding to syslog has no effect. By default, only
923a60
-        forwarding to wall is enabled. These settings may be
923a60
+        forwarding to syslog and wall is enabled. These settings may be
923a60
         overridden at boot time with the kernel command line options
923a60
         <literal>systemd.journald.forward_to_syslog=</literal>,
923a60
         <literal>systemd.journald.forward_to_kmsg=</literal>,
923a60
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
923a60
index f13147f659..6a35ebbde0 100644
923a60
--- a/src/journal/journald-server.c
923a60
+++ b/src/journal/journald-server.c
923a60
@@ -1470,6 +1470,7 @@ int server_init(Server *s) {
923a60
         s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL;
923a60
         s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
923a60
 
923a60
+        s->forward_to_syslog = true;
923a60
         s->forward_to_wall = true;
923a60
 
923a60
         s->max_file_usec = DEFAULT_MAX_FILE_USEC;
923a60
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
923a60
index 47eefe91c1..3907dfb7ff 100644
923a60
--- a/src/journal/journald.conf
923a60
+++ b/src/journal/journald.conf
923a60
@@ -27,7 +27,7 @@
923a60
 #RuntimeMaxFileSize=
923a60
 #MaxRetentionSec=
923a60
 #MaxFileSec=1month
923a60
-#ForwardToSyslog=no
923a60
+#ForwardToSyslog=yes
923a60
 #ForwardToKMsg=no
923a60
 #ForwardToConsole=no
923a60
 #ForwardToWall=yes