|
 |
ff6046 |
From 7a650ee8d3faf79fd5ef866b69741880a3a42b8d Mon Sep 17 00:00:00 2001
|
|
|
ff6046 |
From: Jan Synacek <jsynacek@redhat.com>
|
|
|
ff6046 |
Date: Thu, 2 May 2019 14:11:54 +0200
|
|
|
ff6046 |
Subject: [PATCH] journal: don't enable systemd-journald-audit.socket by
|
|
|
ff6046 |
default
|
|
|
ff6046 |
|
|
|
ff6046 |
Resolves: #1699287
|
|
|
ff6046 |
---
|
|
|
ff6046 |
units/meson.build | 3 +--
|
|
|
ff6046 |
units/systemd-journald.service.in | 2 +-
|
|
|
ff6046 |
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
ff6046 |
|
|
|
ff6046 |
diff --git a/units/meson.build b/units/meson.build
|
|
|
ff6046 |
index e4ac6ced64..e118d81888 100644
|
|
|
ff6046 |
--- a/units/meson.build
|
|
|
ff6046 |
+++ b/units/meson.build
|
|
|
ff6046 |
@@ -89,8 +89,7 @@ units = [
|
|
|
ff6046 |
'sockets.target.wants/'],
|
|
|
ff6046 |
['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
|
|
|
ff6046 |
['systemd-journal-remote.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'],
|
|
|
ff6046 |
- ['systemd-journald-audit.socket', '',
|
|
|
ff6046 |
- 'sockets.target.wants/'],
|
|
|
ff6046 |
+ ['systemd-journald-audit.socket', ''],
|
|
|
ff6046 |
['systemd-journald-dev-log.socket', '',
|
|
|
ff6046 |
'sockets.target.wants/'],
|
|
|
ff6046 |
['systemd-journald.socket', '',
|
|
|
ff6046 |
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
|
|
|
ff6046 |
index 4eab2fa841..e109b25792 100644
|
|
|
ff6046 |
--- a/units/systemd-journald.service.in
|
|
|
ff6046 |
+++ b/units/systemd-journald.service.in
|
|
|
ff6046 |
@@ -17,7 +17,7 @@ Before=sysinit.target
|
|
|
ff6046 |
|
|
|
ff6046 |
[Service]
|
|
|
ff6046 |
Type=notify
|
|
|
ff6046 |
-Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket
|
|
|
ff6046 |
+Sockets=systemd-journald.socket systemd-journald-dev-log.socket
|
|
|
ff6046 |
ExecStart=@rootlibexecdir@/systemd-journald
|
|
|
ff6046 |
Restart=always
|
|
|
ff6046 |
RestartSec=0
|