resolved: run as unpriviliged "systemd-resolve" user

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b26bc3ceebbc66cb91f22a4848d938b0385da3f..de42424912d9ca39d0015126555eb5925598381c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1798,9 +1798,6 @@ systemd_detect_virt_SOURCES = \
 systemd_detect_virt_LDADD = \
        libsystemd-shared.la
 
-systemd-detect-virt-install-hook:
-       -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt
-
 INSTALL_EXEC_HOOKS += \
        systemd-detect-virt-install-hook
 
@@ -4218,6 +4215,7 @@ CLEANFILES += \
        src/resolve/resolved-gperf.c
 
 systemd_resolved_LDADD = \
+       libsystemd-capability.la \
        libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-internal.la \
@@ -4256,14 +4254,13 @@ systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libsystemd-networkd-core.la \
-       $(KMOD_LIBS)
+       libsystemd-capability.la
 
 noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
 
 libsystemd_networkd_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)
 
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
@@ -4271,6 +4268,7 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
        src/network/networkd-tunnel.c \
+       src/network/networkd-veth.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -4291,8 +4289,7 @@ rootlibexec_PROGRAMS += \
        systemd-networkd-wait-online
 
 systemd_networkd_wait_online_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)
 
 systemd_networkd_wait_online_SOURCES = \
        src/libsystemd-network/network-internal.h \
@@ -4309,12 +4306,10 @@ test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)
 
 test_network_LDADD = \
        libsystemd-networkd-core.la
-       $(KMOD_LIBS)
 
 tests += \
        test-network