dcavalca / rpms / systemd

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