dcavalca / rpms / systemd

Forked from rpms/systemd 4 months ago
Clone
aa0848
From f1d66259bcff8333d7dd495bbeef274206f7300d Mon Sep 17 00:00:00 2001
aa0848
From: Jan Synacek <jsynacek@redhat.com>
aa0848
Date: Thu, 2 May 2019 14:11:54 +0200
aa0848
Subject: [PATCH] journal: don't enable systemd-journald-audit.socket by
aa0848
 default
aa0848
aa0848
RHEL-only
aa0848
aa0848
Resolves: #1973856
aa0848
---
aa0848
 units/meson.build                 | 3 +--
aa0848
 units/systemd-journald.service.in | 2 +-
aa0848
 2 files changed, 2 insertions(+), 3 deletions(-)
aa0848
aa0848
diff --git a/units/meson.build b/units/meson.build
aa0848
index a9bf28f6d9..69d53f4259 100644
aa0848
--- a/units/meson.build
aa0848
+++ b/units/meson.build
aa0848
@@ -124,8 +124,7 @@ units = [
aa0848
          'sysinit.target.wants/'],
aa0848
         ['systemd-journal-gatewayd.socket',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
aa0848
         ['systemd-journal-remote.socket',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
aa0848
-        ['systemd-journald-audit.socket',       '',
aa0848
-         'sockets.target.wants/'],
aa0848
+        ['systemd-journald-audit.socket',       ''],
aa0848
         ['systemd-journald-dev-log.socket',     '',
aa0848
          'sockets.target.wants/'],
aa0848
         ['systemd-journald.socket',             '',
aa0848
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
aa0848
index cd17b6b4e7..d981273b07 100644
aa0848
--- a/units/systemd-journald.service.in
aa0848
+++ b/units/systemd-journald.service.in
aa0848
@@ -12,7 +12,7 @@ Description=Journal Service
aa0848
 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
aa0848
 DefaultDependencies=no
aa0848
 Requires=systemd-journald.socket
aa0848
-After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket syslog.socket
aa0848
+After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket
aa0848
 Before=sysinit.target
aa0848
 
aa0848
 [Service]