X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=13211c45bdfe2582c1db8f50ba17f7cf30b9e9ac;hb=ebe5d6d0d05d1f17c96315c42f8d9bcf5e13ba9d;hp=5453868f825d4b7af2cb1c01e48241b76149525f;hpb=25ee45f9953c121fc26a54a85ad7bb3a3180152b;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 5453868f8..13211c45b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -318,7 +318,6 @@ systemd_analyze_LDADD = \
 dist_bashcompletion_DATA = \
 	shell-completion/bash/journalctl \
 	shell-completion/bash/systemctl \
-	shell-completion/bash/systemd-coredumpctl \
 	shell-completion/bash/udevadm
 
 dist_tmpfiles_DATA = \
@@ -343,6 +342,8 @@ 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 \
@@ -2374,13 +2375,6 @@ journalctl_LDADD += \
 	$(QRENCODE_LIBS)
 endif
 
-systemd_coredumpctl_SOURCES = \
-	src/journal/coredumpctl.c
-
-systemd_coredumpctl_LDADD = \
-	libsystemd-shared.la \
-	libsystemd-journal.la
-
 test_journal_SOURCES = \
 	src/journal/test-journal.c
 
@@ -2569,9 +2563,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*
@@ -2625,7 +2626,6 @@ rootbin_PROGRAMS += \
 	journalctl
 
 bin_PROGRAMS += \
-	systemd-coredumpctl \
 	systemd-cat
 
 dist_systemunit_DATA += \
@@ -2717,6 +2717,19 @@ endif
 rootlibexec_PROGRAMS += \
 	systemd-coredump
 
+systemd_coredumpctl_SOURCES = \
+	src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-journal.la
+
+bin_PROGRAMS += \
+	systemd-coredumpctl
+
+dist_bashcompletion_DATA += \
+	shell-completion/bash/systemd-coredumpctl
+
 sysctl_DATA = \
 	sysctl.d/coredump.conf