summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2025-04-10 06:42:10 +0200
committerGitHub <noreply@github.com>2025-04-10 06:42:10 +0200
commit8eb5915b7630f94067d4e8e9eb872ed6730d52d2 (patch)
tree4a2c18d714090fede0957ce400f5a247d72420e7
parentada2cac0324dd3fa668b9af58f119b8a64b4e9e1 (diff)
parent91d428f1084d26e4fac3560c7321a3dc2000e0e1 (diff)
downloadvyos-1x-8eb5915b7630f94067d4e8e9eb872ed6730d52d2.tar.gz
vyos-1x-8eb5915b7630f94067d4e8e9eb872ed6730d52d2.zip
Merge pull request #4433 from woodsb02/patch-3
T7311: syslog: Fix duplicate kernel log entries
-rw-r--r--data/templates/rsyslog/rsyslog.conf.j27
1 files changed, 3 insertions, 4 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2
index a67e596fc..6ef2afcaf 100644
--- a/data/templates/rsyslog/rsyslog.conf.j2
+++ b/data/templates/rsyslog/rsyslog.conf.j2
@@ -1,16 +1,15 @@
### Autogenerated by system_syslog.py ###
#### MODULES ####
-# Load input modules for local logging and kernel logging
+# Load input modules for local logging and journald
# Old-style log file format with low-precision timestamps
# A modern-style logfile format with high-precision timestamps and timezone info
# RSYSLOG_FileFormat
module(load="builtin:omfile" Template="RSYSLOG_TraditionalFileFormat")
-module(load="imuxsock") # provides support for local system logging
-module(load="imklog") # provides kernel logging support
+module(load="imuxsock") # provides support for local system logging (collection from /dev/log unix socket)
-# Import logs from journald
+# Import logs from journald, which includes kernel log messages
module(
load="imjournal"
StateFile="/var/spool/rsyslog/imjournal.state" # Persistent state file to track the journal cursor