From e210077f350aef9fd31a5f7398f91e99975107cb0cb701ba19980a2906a4216c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 7 May 2014 09:34:13 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=619 --- ...fix-permissions-on-new-journal-files.patch | 27 +++++++++++++++++++ systemd-mini.spec | 3 +++ systemd.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 0001-tmpfiles-fix-permissions-on-new-journal-files.patch diff --git a/0001-tmpfiles-fix-permissions-on-new-journal-files.patch b/0001-tmpfiles-fix-permissions-on-new-journal-files.patch new file mode 100644 index 00000000..de54a2e5 --- /dev/null +++ b/0001-tmpfiles-fix-permissions-on-new-journal-files.patch @@ -0,0 +1,27 @@ +From a606871da508995f5ede113a8fc6538afd98966c Mon Sep 17 00:00:00 2001 +From: Greg KH +Date: Tue, 15 Apr 2014 14:12:01 -0700 +Subject: [PATCH] tmpfiles: fix permissions on new journal files + +When starting up journald on a new system, set the proper permissions on +the system.journal files, not only on the journal directory. +--- + tmpfiles.d/systemd.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git tmpfiles.d/systemd.conf tmpfiles.d/systemd.conf +index 7c6d6b9..c470045 100644 +--- tmpfiles.d/systemd.conf ++++ tmpfiles.d/systemd.conf +@@ -23,6 +23,6 @@ d /run/systemd/machines 0755 root root - + d /run/systemd/shutdown 0755 root root - + + m /var/log/journal 2755 root systemd-journal - - +-m /var/log/journal/%m 2755 root systemd-journal - - ++Z /var/log/journal/%m 2755 root systemd-journal - - + m /run/log/journal 2755 root systemd-journal - - +-m /run/log/journal/%m 2755 root systemd-journal - - ++Z /run/log/journal/%m 2755 root systemd-journal - - +-- +1.7.9.2 + diff --git a/systemd-mini.spec b/systemd-mini.spec index b06165fd..c0d498d7 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -403,6 +403,8 @@ Patch204: shut-up-annoying-assertion-monotonic-clock-message.patch Patch205: keep-crypt-password-prompt.patch # PATCH-FIX-UPSTREAM Fix uninitialized memory Patch206: 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch +# PATCH-FIX-UPSTREAM Make systemd user journal accessible by users (bnc#876694) +Patch207: 0001-tmpfiles-fix-permissions-on-new-journal-files.patch # UDEV PATCHES # ============ @@ -792,6 +794,7 @@ cp %{SOURCE7} m4/ %patch204 -p1 %patch205 -p1 %patch206 -p0 +%patch207 -p0 # udev patches %patch1001 -p1 diff --git a/systemd.spec b/systemd.spec index 038af1d1..46db4472 100644 --- a/systemd.spec +++ b/systemd.spec @@ -398,6 +398,8 @@ Patch204: shut-up-annoying-assertion-monotonic-clock-message.patch Patch205: keep-crypt-password-prompt.patch # PATCH-FIX-UPSTREAM Fix uninitialized memory Patch206: 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch +# PATCH-FIX-UPSTREAM Make systemd user journal accessible by users (bnc#876694) +Patch207: 0001-tmpfiles-fix-permissions-on-new-journal-files.patch # UDEV PATCHES # ============ @@ -787,6 +789,7 @@ cp %{SOURCE7} m4/ %patch204 -p1 %patch205 -p1 %patch206 -p0 +%patch207 -p0 # udev patches %patch1001 -p1