Reset signal-mask on re-exec to init=..

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index abf8a2bb3e902b0b08e084010ee835362e4b04de..ec5f04d9e90d15448afd75da16224a20ad6d58d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -460,7 +460,8 @@ dist_systemunit_DATA = \
        units/systemd-udevd-control.socket \
        units/systemd-udevd-kernel.socket \
        units/system-update.target \
-       units/initrd-switch-root.target
+       units/initrd-switch-root.target \
+       units/ldconfig.service
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -1742,7 +1743,8 @@ dist_tmpfiles_DATA = \
        tmpfiles.d/systemd-nologin.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
-       tmpfiles.d/var.conf
+       tmpfiles.d/var.conf \
+       tmpfiles.d/etc.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -1781,7 +1783,7 @@ systemd_sysusers_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
-rootlibexec_PROGRAMS += \
+rootbin_PROGRAMS += \
        systemd-sysusers
 
 nodist_systemunit_DATA += \
@@ -2552,15 +2554,18 @@ libsystemd_network_la_CFLAGS = \
 libsystemd_network_la_SOURCES = \
        src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
+       src/systemd/sd-dhcp-server.h \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
        src/network/sd-network.c \
        src/network/network-util.h \
        src/libsystemd-network/sd-dhcp-client.c \
+       src/libsystemd-network/sd-dhcp-server.c \
        src/libsystemd-network/dhcp-network.c \
        src/libsystemd-network/dhcp-option.c \
        src/libsystemd-network/dhcp-packet.c \
        src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/dhcp-server-internal.h \
        src/libsystemd-network/dhcp-protocol.h \
        src/libsystemd-network/dhcp-lease-internal.h \
        src/libsystemd-network/sd-dhcp-lease.c \
@@ -2600,6 +2605,14 @@ test_dhcp_client_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_dhcp_server_SOURCES = \
+       src/libsystemd-network/test-dhcp-server.c
+
+test_dhcp_server_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 test_ipv4ll_SOURCES = \
        src/systemd/sd-ipv4ll.h \
        src/libsystemd-network/ipv4ll-internal.h \
@@ -2614,6 +2627,7 @@ test_ipv4ll_LDADD = \
 tests += \
        test-dhcp-option \
        test-dhcp-client \
+       test-dhcp-server \
        test-ipv4ll
 
 # ------------------------------------------------------------------------------
@@ -5129,7 +5143,8 @@ endif
 
 SYSINIT_TARGET_WANTS += \
        systemd-update-utmp.service \
-       systemd-update-done.service
+       systemd-update-done.service \
+       ldconfig.service
 
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \