From b6e676ce41508e2aeea22202fc8f234126177f52 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Mar 2015 00:56:08 +0100
Subject: importd: add new bus calls for importing local tar and raw images

This also adds "machinectl import-raw" and "machinectl import-tar" to
wrap these new bus calls.

THe commands basically do for local files that "machinectl pull-raw" and
friends do for remote files.
---
 src/import/pull-dkr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/import/pull-dkr.c')

diff --git a/src/import/pull-dkr.c b/src/import/pull-dkr.c
index ecbf8063ce..3a9beadf61 100644
--- a/src/import/pull-dkr.c
+++ b/src/import/pull-dkr.c
@@ -34,6 +34,7 @@
 #include "aufs-util.h"
 #include "pull-job.h"
 #include "pull-common.h"
+#include "import-common.h"
 #include "pull-dkr.h"
 
 typedef enum DkrProgress {
@@ -491,7 +492,7 @@ static int dkr_pull_job_on_open_disk(PullJob *j) {
         if (r < 0)
                 return log_error_errno(r, "Failed to make btrfs subvolume %s: %m", i->temp_path);
 
-        j->disk_fd = pull_fork_tar(i->temp_path, &i->tar_pid);
+        j->disk_fd = import_fork_tar(i->temp_path, &i->tar_pid);
         if (j->disk_fd < 0)
                 return j->disk_fd;
 
-- 
cgit v1.2.3-54-g00ecf