X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=60f69fe32fc90b16054850c3e68b1450f3a5e366;hb=d4e85aac0bed39c8341da2614609c3d62825f1bf;hp=e02dede7a139ca159c2ab48ff3b63e6f6a3efc74;hpb=0c26bfc3d21fdb3963f1248c237e2f1a33b5566d;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index e02dede7a..60f69fe32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,8 @@ userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysusersdir=$(prefix)/lib/sysusers.d
 sysctldir=$(prefix)/lib/sysctl.d
+binfmtdir=$(prefix)/lib/binfmt.d
+modulesloaddir=$(prefix)/lib/modules-load.d
 networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
@@ -1846,15 +1848,18 @@ nodist_systemunit_DATA += \
 SYSINIT_TARGET_WANTS += \
 	systemd-sysusers.service
 
-nodist_sysusers_DATA = \
+dist_sysusers_DATA = \
 	sysusers.d/systemd.conf
 
+nodist_sysusers_DATA = \
+	sysusers.d/basic.conf
+
 EXTRA_DIST += \
 	units/systemd-sysusers.service.in \
-	sysusers.d/systemd.conf.in
+	sysusers.d/basic.conf.in
 
 CLEANFILES += \
-	sysusers.d/systemd.conf
+	sysusers.d/basic.conf
 
 INSTALL_DIRS += \
 	$(sysusersdir)
@@ -3771,7 +3776,9 @@ systemd_socket_proxyd_LDADD = \
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
-	src/journal/coredump.c
+	src/journal/coredump.c \
+	src/journal/coredump-vacuum.c \
+	src/journal/coredump-vacuum.h
 
 systemd_coredump_LDADD = \
 	libsystemd-journal-internal.la \
@@ -3810,6 +3817,18 @@ coredumpctl_LDADD = \
 bin_PROGRAMS += \
 	coredumpctl
 
+manual_tests += \
+	test-coredump-vacuum
+
+test_coredump_vacuum_SOURCES = \
+	src/journal/test-coredump-vacuum.c  \
+	src/journal/coredump-vacuum.c \
+	src/journal/coredump-vacuum.h
+
+test_coredump_vacuum_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
 dist_bashcompletion_DATA += \
 	shell-completion/bash/coredumpctl
 
@@ -5121,7 +5140,11 @@ substitutions = \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|'
+       '|TTY_GID=$(TTY_GID)|' \
+       '|systemsleepdir=$(systemsleepdir)|' \
+       '|systemshutdowndir=$(systemshutdowndir)|' \
+       '|binfmtdir=$(binfmtdir)|' \
+       '|modulesloaddir=$(modulesloaddir)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \