diff --git a/journal-don-t-enable-systemd-journald-audit.socket-b.patch b/journal-don-t-enable-systemd-journald-audit.socket-b.patch index ca97a3ef021f120f6a4bbc920af5b75cca02137e..f81ffb3ee4296a0a1d4f8e1dffd3d0befa2549b2 100644 --- a/journal-don-t-enable-systemd-journald-audit.socket-b.patch +++ b/journal-don-t-enable-systemd-journald-audit.socket-b.patch @@ -7,26 +7,11 @@ 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 4eb09a3..ccea8a6 100644 ---- a/units/meson.build -+++ b/units/meson.build -@@ -110,8 +110,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 0cb1bfa..fa7348a 100644 +index 0cb1bfa3ca..fa7348aa79 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -34,7 +34,7 @@ RestrictRealtime=yes diff --git a/systemd.spec b/systemd.spec index 7462dc05c64b318e458c6fb246ce5027c014b1ae..ccbbca7445ad3b72cadcf7e9de4c1513f3bbe099 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 246 -Release: 11 +Release: 12 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -531,12 +531,6 @@ systemctl daemon-reexec &>/dev/null || : journalctl --update-catalog &>/dev/null || : systemd-tmpfiles --create &>/dev/null || : -# create /var/log/journal only on initial installation, -# and only if it's writable (it won't be in rpm-ostree). -if [ $1 -eq 1 ] && [ -w %{_localstatedir} ]; then - mkdir -p %{_localstatedir}/log/journal -fi - # Make sure new journal files will be owned by the "systemd-journal" group machine_id=$(cat /etc/machine-id 2>/dev/null) chgrp systemd-journal /{run,var}/log/journal/{,${machine_id}} &>/dev/null || : @@ -1098,6 +1092,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 @@ -1492,6 +1487,13 @@ fi %exclude /usr/share/man/man3/* %changelog +* Wed Dec 16 2020 shenyangyang - 246-12 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:revert don't enable systemd-journald-audit.socket by default + and do not create /var/log/journal on initial installation + * Wed Nov 25 2020 shenyangyang - 246-11 - Type:enhancement - ID:NA @@ -1968,7 +1970,7 @@ fi - Type:bugfix - ID:NA - SUG:restart -- DESC:do not create /var/log/journal on initial installation refer to redhat8 +- DESC:do not create /var/log/journal on initial installation * Sat Feb 02 2019 Yi Cang - 239-3.h3 - Type:enhance