chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: introduce new "systemd-journal" group and make it own the journal files
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e23a6b44829ec04a2ac8f8b3ea3b2f131baae6ef..13211c45bdfe2582c1db8f50ba17f7cf30b9e9ac 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-318,7
+318,6
@@
systemd_analyze_LDADD = \
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
- shell-completion/bash/systemd-coredumpctl \
shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
@@
-2376,13
+2375,6
@@
journalctl_LDADD += \
$(QRENCODE_LIBS)
endif
$(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
test_journal_SOURCES = \
src/journal/test-journal.c
@@
-2571,9
+2563,16
@@
libsystemd_journal_internal_la_LIBADD += \
$(GCRYPT_LIBS)
endif
$(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)
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*
libsystemd-journal-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
@@
-2627,7
+2626,6
@@
rootbin_PROGRAMS += \
journalctl
bin_PROGRAMS += \
journalctl
bin_PROGRAMS += \
- systemd-coredumpctl \
systemd-cat
dist_systemunit_DATA += \
systemd-cat
dist_systemunit_DATA += \
@@
-2719,6
+2717,19
@@
endif
rootlibexec_PROGRAMS += \
systemd-coredump
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
sysctl_DATA = \
sysctl.d/coredump.conf