diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-06 01:22:14 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-06 01:49:06 +0200 |
| commit | f757855e81fc0bc116de372220096e532afb5cb8 (patch) | |
| tree | 5acce8aaffe9ec5e49926cb2a84bb8391e52e0e5 /Makefile.am | |
| parent | 5f430ff76e8e5f7ca5b7ef67dd3b205487a0f41b (diff) | |
| download | systemd-f757855e81fc0bc116de372220096e532afb5cb8.tar.gz | |
nspawn: add new .nspawn files for container settings
.nspawn fiels are simple settings files that may accompany container
images and directories and contain settings otherwise passed on the
nspawn command line. This provides an efficient way to attach execution
data directly to containers.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 003308e580..1a844acc13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,6 +155,7 @@ noinst_PROGRAMS = TESTS = endif udevlibexec_PROGRAMS = +gperf_gperf_sources = in_files = $(filter %.in,$(EXTRA_DIST)) in_in_files = $(filter %.in.in, $(in_files)) @@ -220,6 +221,7 @@ AM_CPPFLAGS = \ -I $(top_builddir)/src/journal \ -I $(top_srcdir)/src/timedate \ -I $(top_srcdir)/src/timesync \ + -I $(top_srcdir)/src/nspawn \ -I $(top_srcdir)/src/resolve \ -I $(top_builddir)/src/resolve \ -I $(top_srcdir)/src/systemd \ @@ -2776,11 +2778,20 @@ systemd_cgtop_LDADD = \ # ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ src/nspawn/nspawn.c \ + src/nspawn/nspawn.h \ + src/nspawn/nspawn-settings.c \ + src/nspawn/nspawn-settings.h \ src/core/mount-setup.c \ src/core/mount-setup.h \ src/core/loopback-setup.c \ src/core/loopback-setup.h +nodist_systemd_nspawn_SOURCES = \ + src/nspawn/nspawn-gperf.c + +gperf_gperf_sources += \ + src/nspawn/nspawn-gperf.gperf + systemd_nspawn_CFLAGS = \ $(AM_CFLAGS) \ $(BLKID_CFLAGS) \ @@ -3486,7 +3497,7 @@ nodist_libudev_core_la_SOURCES = \ src/udev/keyboard-keys-to-name.h \ src/udev/net/link-config-gperf.c -gperf_gperf_sources = \ +gperf_gperf_sources += \ src/udev/net/link-config-gperf.gperf libudev_core_la_CFLAGS = \ |