revert don't enable systemd-journald-audit.socket by default

This commit is contained in:
Yangyang Shen 2020-12-14 14:10:47 +08:00
parent 6aa75ab377
commit ccd97e8e83
2 changed files with 12 additions and 18 deletions

View File

@ -7,24 +7,9 @@ Subject: [PATCH] journal: don't enable systemd-journald-audit.socket
Resolves: #1699287
---
units/meson.build | 3 +--
units/systemd-journald.service.in | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/units/meson.build b/units/meson.build
index e105ade..48c621d 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -88,8 +88,7 @@ units = [
'sockets.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 089bc38..7436619 100644
--- a/units/systemd-journald.service.in
@ -39,5 +24,5 @@ index 089bc38..7436619 100644
SystemCallArchitectures=native
SystemCallErrorNumber=EPERM
--
2.23.0
2.19.1

View File

@ -16,7 +16,7 @@
Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 243
Release: 28
Release: 29
License: MIT and LGPLv2+ and GPLv2+
Summary: System and Service Manager
@ -1139,6 +1139,7 @@ fi
%{_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service
%{_unitdir}/systemd-hostnamed.service.d/disable-privatedevices.conf
%{_unitdir}/sockets.target.wants/systemd-coredump.socket
%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket
%{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket
%{_unitdir}/sockets.target.wants/systemd-journald.socket
%{_unitdir}/sockets.target.wants/systemd-initctl.socket
@ -1503,6 +1504,14 @@ fi
%exclude /usr/share/man/man3/*
%changelog
* Mon Dec 14 2020 shenyangyang <shenyangyang4@huawei.com> - 243-29
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:revert don't enable systemd-journald-audit.socket by default
that may cause reboot problem if update systemd with out dracut -f
from LTS-20.03
* Wed Nov 25 2020 shenyangyang <shenyangyang4@huawei.com> - 243-28
- Type:enhancement
- ID:NA