This way "systemd-importd" is the daemon that uses "systemd-pull" as
backend worker.
rootlibexec_PROGRAMS += \
systemd-importd \
rootlibexec_PROGRAMS += \
systemd-importd \
systemd_importd_SOURCES = \
systemd_importd_SOURCES = \
- src/import/importd.c \
- src/import/importd.h
systemd_importd_CFLAGS = \
$(AM_CFLAGS) \
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\"
+ -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-import\"
systemd_importd_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
systemd_importd_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
-systemd_import_SOURCES = \
- src/import/import.c \
+systemd_pull_SOURCES = \
+ src/import/pull.c \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import-tar.c \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import-tar.c \
src/import/qcow2-util.c \
src/import/qcow2-util.h
src/import/qcow2-util.c \
src/import/qcow2-util.h
-systemd_import_CFLAGS = \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(XZ_CFLAGS) \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(XZ_CFLAGS) \
-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
-systemd_import_LDADD = \
libsystemd-internal.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-internal.la \
libsystemd-label.la \
libsystemd-shared.la \
return -errno;
if (t->pid == 0) {
const char *cmd[] = {
return -errno;
if (t->pid == 0) {
const char *cmd[] = {
t->type == TRANSFER_TAR ? "pull-tar" :
t->type == TRANSFER_RAW ? "pull-raw" :
"pull-dkr",
t->type == TRANSFER_TAR ? "pull-tar" :
t->type == TRANSFER_RAW ? "pull-raw" :
"pull-dkr",
cmd[k++] = t->local;
cmd[k] = NULL;
cmd[k++] = t->local;
cmd[k] = NULL;
- execv(SYSTEMD_IMPORT_PATH, (char * const *) cmd);
+ execv(SYSTEMD_PULL_PATH, (char * const *) cmd);
log_error_errno(errno, "Failed to execute import tool: %m");
_exit(EXIT_FAILURE);
}
log_error_errno(errno, "Failed to execute import tool: %m");
_exit(EXIT_FAILURE);
}