SHA256
1
0
forked from pool/systemd
Dr. Werner Fink 2014-05-07 09:34:13 +00:00 committed by Git OBS Bridge
parent 888bc4fd00
commit 887561ea63
3 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From a606871da508995f5ede113a8fc6538afd98966c Mon Sep 17 00:00:00 2001
From: Greg KH <gregkh@linuxfoundation.org>
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

View File

@ -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

View File

@ -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