allow group adm read access on /var/log/journal

Closes: #717386

diff --git a/debian/changelog b/debian/changelog
index c18eddf3c5b5078ab73a650fda98d3affb7a8c8b..8dd4859c59a2007d9573a17bb53eec24029277b3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ systemd (204-6) UNRELEASED; urgency=low
   * systemctl: mangle names when avoiding dbus (Closes: #723855)
   * Make 99-systemd.rules check for /run/systemd/systemd instead of the
     ill-named cgroups directory.
+  * allow group adm read access on /var/log/journal (Closes: #717386)
 
  -- Tollef Fog Heen <tfheen@debian.org>  Mon, 28 Oct 2013 14:31:16 +0100
 

diff --git a/debian/control b/debian/control
index 7458659ecb9c6628702900975f4e6d0e95b153d6..20e6760b1a914e894198708ad3cefab91b15eadb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,8 @@ Depends: ${shlibs:Depends},
          libsystemd-login0 (= ${binary:Version}),
          util-linux (>= 2.19.1-2),
          initscripts (>= 2.88dsf-17),
-         udev
+         udev,
+         acl
 Breaks: lvm2 (<< 2.02.84-1),
         lsb-base (<< 4.1+Debian4)
 Conflicts: klogd

diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index c4e2d62bc53b6359b0deb1a192428576ead3e5bf..eebe4dd3c6527e2f861b043bded08f991b0c339a 100644 (file)
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -83,4 +83,10 @@ systemd-machine-id-setup
 # initial update of the Message Catalogs database
 _update_catalog
 
+# Grant read access to /var/log/journal for members of the adm group via a
+# filesystem ACL. This makes them able to read the journal.
+# Failure is ignored since there might be file systems mounted without ACL
+# support.
+setfacl -nm g:adm:rx,d:g:adm:rx /var/log/journal || true
+
 #DEBHELPER#