diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-01-22 03:57:15 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-01-22 04:02:07 +0100 |
| commit | 3d7415f43f0fe6a821d7bc4a341ba371e8a30ef3 (patch) | |
| tree | d79e54dec69645a894a4ec12d6abf765515d245f /Makefile.am | |
| parent | f4c135bf2f0abcf79c89efbeae51f03bacba5f2f (diff) | |
import: introduce new mini-daemon systemd-importd, and make machinectl a client to it
The old "systemd-import" binary is now an internal tool. We still use it
as asynchronous backend for systemd-importd. Since the import tool might
require some IO and CPU resources (due to qcow2 explosion, and
decompression), and because we might want to run it with more minimal
priviliges we still keep it around as the worker binary to execute as
child process of importd.
machinectl now has verbs for pulling down images, cancelling them and
listing them.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 62 |
1 files changed, 56 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index ca5d3ba173..e86075f23a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -902,7 +902,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/verbs.h \ src/shared/sigbus.c \ src/shared/sigbus.h \ - src/shared/build.h + src/shared/build.h \ + src/shared/import-util.c \ + src/shared/import-util.h if HAVE_UTMP libsystemd_shared_la_SOURCES += \ @@ -5253,15 +5255,35 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la +endif + +# ------------------------------------------------------------------------------ +if ENABLE_IMPORTD + if HAVE_LIBCURL if HAVE_XZ if HAVE_ZLIB if HAVE_BZIP2 if HAVE_GCRYPT -bin_PROGRAMS += \ +rootlibexec_PROGRAMS += \ + systemd-importd \ systemd-import +systemd_importd_SOURCES = \ + src/import/importd.c \ + src/import/importd.h + +systemd_importd_CFLAGS = \ + $(AM_CFLAGS) \ + -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \ + -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \ + -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" + +systemd_importd_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + systemd_import_SOURCES = \ src/import/import.c \ src/import/import-raw.c \ @@ -5272,8 +5294,8 @@ systemd_import_SOURCES = \ src/import/import-dkr.h \ src/import/import-job.c \ src/import/import-job.h \ - src/import/import-util.c \ - src/import/import-util.h \ + src/import/import-common.c \ + src/import/import-common.h \ src/import/curl-util.c \ src/import/curl-util.h \ src/import/aufs-util.c \ @@ -5300,6 +5322,36 @@ systemd_import_LDADD = \ -lbz2 \ $(GCRYPT_LIBS) +dist_rootlibexec_DATA = \ + src/import/import-pubring.gpg + +nodist_systemunit_DATA += \ + units/systemd-importd.service + +EXTRA_DIST += \ + units/systemd-importd.service.in + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.import1.busname + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.import1.busname + +SYSTEM_UNIT_ALIASES += \ + systemd-importd.service dbus-org.freedesktop.import1.service + +dist_dbussystemservice_DATA += \ + src/import/org.freedesktop.import1.service + +dist_dbuspolicy_DATA += \ + src/import/org.freedesktop.import1.conf + +polkitpolicy_files += \ + src/import/org.freedesktop.import1.policy + +polkitpolicy_in_files += \ + src/import/org.freedesktop.import1.policy.in + manual_tests += \ test-qcow2 @@ -5318,8 +5370,6 @@ test_qcow2_LDADD = \ libsystemd-shared.la \ $(ZLIB_LIBS) -dist_rootlibexec_DATA = \ - src/import/import-pubring.gpg endif endif endif |