summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-04-26 14:57:04 +0200
committerLennart Poettering <lennart@poettering.net>2016-04-26 14:57:04 +0200
commitd7fe83bbc23d9976433fddaf6509cc6bebc0ecdd (patch)
treee5748844e740c3e7452040154fd3035b304eaee8 /Makefile.am
parent6e3930c40f3379b7123e505a71ba4cd6db6c372f (diff)
parent4aeb20f5aaec25ef969989b64d37377913b2a1ef (diff)
Merge pull request #3093 from poettering/nspawn-userns-magic
nspawn automatic user namespaces
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am13
1 files changed, 13 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 0f475c6d09..b323de55c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3021,6 +3021,8 @@ systemd_nspawn_SOURCES = \
src/nspawn/nspawn-setuid.h \
src/nspawn/nspawn-stub-pid1.c \
src/nspawn/nspawn-stub-pid1.h \
+ src/nspawn/nspawn-patch-uid.c \
+ src/nspawn/nspawn-patch-uid.h \
src/core/mount-setup.c \
src/core/mount-setup.h \
src/core/loopback-setup.c \
@@ -3048,6 +3050,17 @@ systemd_nspawn_LDADD += \
libfirewall.la
endif
+test_patch_uid_SOURCES = \
+ src/nspawn/nspawn-patch-uid.c \
+ src/nspawn/nspawn-patch-uid.h \
+ src/nspawn/test-patch-uid.c
+
+test_patch_uid_LDADD = \
+ libshared.la
+
+manual_tests += \
+ test-patch-uid
+
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/run/run.c