importd: try to minimize confusion by renaming "systemd-import" binary to "systemd...

This way "systemd-importd" is the daemon that uses "systemd-pull" as
backend worker.

diff --git a/Makefile.am b/Makefile.am
index 440ba888a0afd228868bff2b77c2f5bf0a02b7a0..d5344b903329801727418c8ab1c68b93df6ca41f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5273,24 +5273,21 @@ if HAVE_GCRYPT
 
 rootlibexec_PROGRAMS += \
        systemd-importd \
-       systemd-import
+       systemd-pull
 
 systemd_importd_SOURCES = \
-       src/import/importd.c \
-       src/import/importd.h
+       src/import/importd.c
 
 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_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 \
@@ -5308,7 +5305,7 @@ systemd_import_SOURCES = \
        src/import/qcow2-util.c \
        src/import/qcow2-util.h
 
-systemd_import_CFLAGS = \
+systemd_pull_CFLAGS = \
        $(AM_CFLAGS) \
        $(LIBCURL_CFLAGS) \
        $(XZ_CFLAGS) \
@@ -5317,7 +5314,7 @@ systemd_import_CFLAGS = \
        -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
        -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
 
-systemd_import_LDADD = \
+systemd_pull_LDADD = \
        libsystemd-internal.la \
        libsystemd-label.la \
        libsystemd-shared.la \

diff --git a/src/import/importd.c b/src/import/importd.c
index a3545cd576fe856927763a4105a67779d4ba672f..40900ce36d755b4deb83332a20e8ed4320f7c9fd 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -342,7 +342,7 @@ static int transfer_start(Transfer *t) {
                 return -errno;
         if (t->pid == 0) {
                 const char *cmd[] = {
-                        "systemd-import",
+                        "systemd-pull",
                         t->type == TRANSFER_TAR ? "pull-tar" :
                         t->type == TRANSFER_RAW ? "pull-raw" :
                                                       "pull-dkr",
@@ -413,7 +413,7 @@ static int transfer_start(Transfer *t) {
                         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);
         }

diff --git a/src/import/import.c b/src/import/pull.c
similarity index 100%
rename from src/import/import.c
rename to src/import/pull.c