Revert "add initrd-fs.target and initrd-fs-pre.target"

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3d3f2652f652c8a3070e188f774800866b160e14..f4ac471a1372b53408f83af372979136b4169c6a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,8 +342,6 @@ dist_systemunit_DATA = \
        units/kexec.target \
        units/local-fs.target \
        units/local-fs-pre.target \
-       units/initrd-fs.target \
-       units/initrd-fs-pre.target \
        units/remote-fs.target \
        units/remote-fs-pre.target \
        units/network.target \
@@ -2563,9 +2561,16 @@ libsystemd_journal_internal_la_LIBADD += \
        $(GCRYPT_LIBS)
 endif
 
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if
+# needed. Also, grant read access to new journal files to members of
+# "adm" and "wheel".
 libsystemd-journal-install-hook:
        libname=libsystemd-journal.so && $(move-to-rootlibdir)
+       $(MKDIR_P) $(DESTDIR)/var/log/journal
+       -chown 0:0 $(DESTDIR)/var/log/journal
+       -chmod 755 $(DESTDIR)/var/log/journal
+       -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+       -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
 
 libsystemd-journal-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*