1 files changed, 13 insertions, 1 deletions
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 1e79585d7..38a28f2c9 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
+  [[ -d /run/systemd/systemd/ ]]
 }
 
 add_privs() {
@@ -11,6 +11,12 @@ add_privs() {
   fi
 }
 
+add_journal_acls() {
+  # ignore errors, since the filesystem might not support ACLs
+  setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/ 2>/dev/null
+  :
+}
+
 post_common() {
   systemd-machine-id-setup
 
@@ -54,6 +60,8 @@ _208_changes() {
 post_install() {
   post_common
 
+  add_journal_acls
+
   # enable getty@tty1 by default, but don't track the file
   systemctl enable getty@tty1.service
 
@@ -115,6 +123,10 @@ post_upgrade() {
   if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then
     _208_changes
   fi
+
+  if [ "$(vercmp 208-8 "$2")" -eq 1 ]; then
+    add_journal_acls
+  fi
 }
 
 # vim:set ts=2 sw=2 et: