diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 08:43:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 08:43:34 -0400 |
| commit | 670b77ddfab0f4eddbe539964aba83d446d48129 (patch) | |
| tree | 5b159fe9bd52169e05cdc60db5a48a5c5ac9602a /src/systemd-nspawn/Makefile | |
| parent | 23708daf3ba69ba9880102b4f720a3842883332e (diff) | |
| parent | 34dbdee3b2f122d2ef903a368b172e75f962b66a (diff) | |
Merge branch 'lukeshu/postmove' into 'lukeshu/master'
Diffstat (limited to 'src/systemd-nspawn/Makefile')
| -rw-r--r-- | src/systemd-nspawn/Makefile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 380266ea7f..9702abcbc5 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -41,10 +41,14 @@ 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 \ - src/core/loopback-setup.h + src/core/loopback-setup.h \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h nodist_systemd_nspawn_SOURCES = \ src/nspawn/nspawn-gperf.c @@ -66,6 +70,17 @@ systemd_nspawn_LDADD += \ libfirewall.la endif # HAVE_LIBIPTC +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 + bin_PROGRAMS += systemd-nspawn systemd_nspawn_LDADD += libsystemd.la # was hidden by libshared->libsystemd systemd_nspawn_LDADD += libbasic.la # was hidden by libshared->libsystemd->libbasic |