importd: fix bus policy

[elogind.git] / src / import / importd.c

diff --git a/src/import/importd.c b/src/import/importd.c
index a3545cd576fe856927763a4105a67779d4ba672f..3e417b174964a863654050c3c61a7bc3c652b339 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -86,7 +86,7 @@ static const char* const transfer_type_table[_TRANSFER_TYPE_MAX] = {
         [TRANSFER_DKR] = "dkr",
 };
 
-DEFINE_PRIVATE_STRING_TABLE_LOOKUP(transfer_type, TransferType);
+DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(transfer_type, TransferType);
 
 static Transfer *transfer_unref(Transfer *t) {
         if (!t)
@@ -342,10 +342,8 @@ static int transfer_start(Transfer *t) {
                 return -errno;
         if (t->pid == 0) {
                 const char *cmd[] = {
-                        "systemd-import",
-                        t->type == TRANSFER_TAR ? "pull-tar" :
-                        t->type == TRANSFER_RAW ? "pull-raw" :
-                                                      "pull-dkr",
+                        "systemd-pull",
+                        transfer_type_to_string(t->type),
                         "--verify",
                         NULL, /* verify argument */
                         NULL, /* maybe --force */
@@ -413,7 +411,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);
         }