42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
|
From 44740b947ed0b34ed9848dae276ec1d448340ce9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Synacek <jsynacek@redhat.com>
|
||
|
|
Date: Thu, 2 May 2019 14:11:54 +0200
|
||
|
|
Subject: [PATCH] journal: don't enable systemd-journald-audit.socket by
|
||
|
|
default
|
||
|
|
|
||
|
|
RHEL-only
|
||
|
|
|
||
|
|
Related: #2138081
|
||
|
|
---
|
||
|
|
units/meson.build | 3 +--
|
||
|
|
units/systemd-journald.service.in | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/units/meson.build b/units/meson.build
|
||
|
|
index 25e9209b4d..b224701eb9 100644
|
||
|
|
--- a/units/meson.build
|
||
|
|
+++ b/units/meson.build
|
||
|
|
@@ -123,8 +123,7 @@ units = [
|
||
|
|
'sysinit.target.wants/'],
|
||
|
|
['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
|
||
|
|
['systemd-journal-remote.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
|
||
|
|
- ['systemd-journald-audit.socket', '',
|
||
|
|
- 'sockets.target.wants/'],
|
||
|
|
+ ['systemd-journald-audit.socket', ''],
|
||
|
|
['systemd-journald-dev-log.socket', '',
|
||
|
|
'sockets.target.wants/'],
|
||
|
|
['systemd-journald.socket', '',
|
||
|
|
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
|
||
|
|
index 38ba3e2856..e8be031de5 100644
|
||
|
|
--- a/units/systemd-journald.service.in
|
||
|
|
+++ b/units/systemd-journald.service.in
|
||
|
|
@@ -12,7 +12,7 @@ Description=Journal Service
|
||
|
|
Documentation=man:systemd-journald.service(8) man:journald.conf(5)
|
||
|
|
DefaultDependencies=no
|
||
|
|
Requires=systemd-journald.socket
|
||
|
|
-After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket syslog.socket
|
||
|
|
+After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket
|
||
|
|
Before=sysinit.target
|
||
|
|
|
||
|
|
# Mount and swap units need the journal socket units. If they were removed by
|