]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - src/import/import-raw.c
tree-wide: use mfree more
[thirdparty/systemd.git] / src / import / import-raw.c
index 67c805ed47e3b85df13d1db1f322a148ecbd37f6..29f3f896e51fb829e90f5f4159712687e038134f 100644 (file)
@@ -1,9 +1,7 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
-  Copyright 2014 Lennart Poettering
+  Copyright 2015 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/xattr.h>
 #include <linux/fs.h>
-#include <sys/prctl.h>
-#include <curl/curl.h>
-#include <gcrypt.h>
 
-#include "utf8.h"
-#include "strv.h"
-#include "copy.h"
+#include "sd-daemon.h"
+#include "sd-event.h"
+
+#include "alloc-util.h"
 #include "btrfs-util.h"
-#include "util.h"
-#include "macro.h"
+#include "chattr-util.h"
+#include "copy.h"
+#include "fd-util.h"
+#include "fileio.h"
+#include "fs-util.h"
+#include "hostname-util.h"
+#include "import-common.h"
+#include "import-compress.h"
+#include "import-raw.h"
+#include "io-util.h"
+#include "machine-pool.h"
 #include "mkdir.h"
-#include "curl-util.h"
+#include "path-util.h"
 #include "qcow2-util.h"
-#include "import-job.h"
-#include "import-util.h"
-#include "import-raw.h"
-
-typedef struct RawImportFile RawImportFile;
+#include "ratelimit.h"
+#include "rm-rf.h"
+#include "string-util.h"
+#include "util.h"
 
 struct RawImport {
         sd_event *event;
-        CurlGlue *glue;
 
         char *image_root;
 
-        ImportJob *raw_job;
-        ImportJob *sha256sums_job;
-        ImportJob *signature_job;
-
         RawImportFinished on_finished;
         void *userdata;
 
         char *local;
         bool force_local;
+        bool read_only;
+        bool grow_machine_directory;
 
         char *temp_path;
         char *final_path;
 
-        ImportVerify verify;
+        int input_fd;
+        int output_fd;
+
+        ImportCompress compress;
+
+        uint64_t written_since_last_grow;
+
+        sd_event_source *input_event_source;
+
+        uint8_t buffer[16*1024];
+        size_t buffer_size;
+
+        uint64_t written_compressed;
+        uint64_t written_uncompressed;
+
+        struct stat st;
+
+        unsigned last_percent;
+        RateLimit progress_rate_limit;
 };
 
 RawImport* raw_import_unref(RawImport *i) {
         if (!i)
                 return NULL;
 
-        import_job_unref(i->raw_job);
-        import_job_unref(i->sha256sums_job);
-        import_job_unref(i->signature_job);
-
-        curl_glue_unref(i->glue);
         sd_event_unref(i->event);
 
         if (i->temp_path) {
@@ -78,15 +91,25 @@ RawImport* raw_import_unref(RawImport *i) {
                 free(i->temp_path);
         }
 
+        import_compress_free(&i->compress);
+
+        sd_event_source_unref(i->input_event_source);
+
+        safe_close(i->output_fd);
+
         free(i->final_path);
         free(i->image_root);
         free(i->local);
-        free(i);
-
-        return NULL;
+        return mfree(i);
 }
 
-int raw_import_new(RawImport **ret, sd_event *event, const char *image_root, RawImportFinished on_finished, void *userdata) {
+int raw_import_new(
+                RawImport **ret,
+                sd_event *event,
+                const char *image_root,
+                RawImportFinished on_finished,
+                void *userdata) {
+
         _cleanup_(raw_import_unrefp) RawImport *i = NULL;
         int r;
 
@@ -96,13 +119,19 @@ int raw_import_new(RawImport **ret, sd_event *event, const char *image_root, Raw
         if (!i)
                 return -ENOMEM;
 
+        i->input_fd = i->output_fd = -1;
         i->on_finished = on_finished;
         i->userdata = userdata;
 
+        RATELIMIT_INIT(i->progress_rate_limit, 100 * USEC_PER_MSEC, 1);
+        i->last_percent = (unsigned) -1;
+
         i->image_root = strdup(image_root ?: "/var/lib/machines");
         if (!i->image_root)
                 return -ENOMEM;
 
+        i->grow_machine_directory = path_startswith(i->image_root, "/var/lib/machines");
+
         if (event)
                 i->event = sd_event_ref(event);
         else {
@@ -111,494 +140,326 @@ int raw_import_new(RawImport **ret, sd_event *event, const char *image_root, Raw
                         return r;
         }
 
-        r = curl_glue_new(&i->glue, i->event);
-        if (r < 0)
-                return r;
-
-        i->glue->on_finished = import_job_curl_on_finished;
-        i->glue->userdata = i;
-
         *ret = i;
         i = NULL;
 
         return 0;
 }
 
+static void raw_import_report_progress(RawImport *i) {
+        unsigned percent;
+        assert(i);
+
+        /* We have no size information, unless the source is a regular file */
+        if (!S_ISREG(i->st.st_mode))
+                return;
+
+        if (i->written_compressed >= (uint64_t) i->st.st_size)
+                percent = 100;
+        else
+                percent = (unsigned) ((i->written_compressed * UINT64_C(100)) / (uint64_t) i->st.st_size);
+
+        if (percent == i->last_percent)
+                return;
+
+        if (!ratelimit_test(&i->progress_rate_limit))
+                return;
+
+        sd_notifyf(false, "X_IMPORT_PROGRESS=%u", percent);
+        log_info("Imported %u%%.", percent);
+
+        i->last_percent = percent;
+}
+
 static int raw_import_maybe_convert_qcow2(RawImport *i) {
         _cleanup_close_ int converted_fd = -1;
         _cleanup_free_ char *t = NULL;
         int r;
 
         assert(i);
-        assert(i->raw_job);
 
-        r = qcow2_detect(i->raw_job->disk_fd);
+        r = qcow2_detect(i->output_fd);
         if (r < 0)
                 return log_error_errno(r, "Failed to detect whether this is a QCOW2 image: %m");
         if (r == 0)
                 return 0;
 
         /* This is a QCOW2 image, let's convert it */
-        r = tempfn_random(i->final_path, &t);
+        r = tempfn_random(i->final_path, NULL, &t);
         if (r < 0)
                 return log_oom();
 
-        converted_fd = open(t, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0644);
+        converted_fd = open(t, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664);
         if (converted_fd < 0)
                 return log_error_errno(errno, "Failed to create %s: %m", t);
 
-        r = chattr_fd(converted_fd, true, FS_NOCOW_FL);
+        r = chattr_fd(converted_fd, FS_NOCOW_FL, FS_NOCOW_FL);
         if (r < 0)
-                log_warning_errno(errno, "Failed to set file attributes on %s: %m", t);
+                log_warning_errno(r, "Failed to set file attributes on %s: %m", t);
 
         log_info("Unpacking QCOW2 file.");
 
-        r = qcow2_convert(i->raw_job->disk_fd, converted_fd);
+        r = qcow2_convert(i->output_fd, converted_fd);
         if (r < 0) {
                 unlink(t);
                 return log_error_errno(r, "Failed to convert qcow2 image: %m");
         }
 
-        unlink(i->temp_path);
+        (void) unlink(i->temp_path);
         free(i->temp_path);
-
         i->temp_path = t;
         t = NULL;
 
-        safe_close(i->raw_job->disk_fd);
-        i->raw_job->disk_fd = converted_fd;
+        safe_close(i->output_fd);
+        i->output_fd = converted_fd;
         converted_fd = -1;
 
         return 1;
 }
 
-static int raw_import_make_local_copy(RawImport *i) {
-        _cleanup_free_ char *tp = NULL;
-        _cleanup_close_ int dfd = -1;
-        const char *p;
+static int raw_import_finish(RawImport *i) {
         int r;
 
         assert(i);
-        assert(i->raw_job);
-
-        if (!i->local)
-                return 0;
-
-        if (i->raw_job->etag_exists) {
-                /* We have downloaded this one previously, reopen it */
-
-                assert(i->raw_job->disk_fd < 0);
-
-                if (!i->final_path) {
-                        r = import_make_path(i->raw_job->url, i->raw_job->etag, i->image_root, ".raw-", ".raw", &i->final_path);
-                        if (r < 0)
-                                return log_oom();
-                }
-
-                i->raw_job->disk_fd = open(i->final_path, O_RDONLY|O_NOCTTY|O_CLOEXEC);
-                if (i->raw_job->disk_fd < 0)
-                        return log_error_errno(errno, "Failed to open vendor image: %m");
-        } else {
-                /* We freshly downloaded the image, use it */
-
-                assert(i->raw_job->disk_fd >= 0);
-
-                if (lseek(i->raw_job->disk_fd, SEEK_SET, 0) == (off_t) -1)
-                        return log_error_errno(errno, "Failed to seek to beginning of vendor image: %m");
-        }
-
-        p = strappenda(i->image_root, "/", i->local, ".raw");
-
-        if (i->force_local) {
-                (void) btrfs_subvol_remove(p);
-                (void) rm_rf_dangerous(p, false, true, false);
+        assert(i->output_fd >= 0);
+        assert(i->temp_path);
+        assert(i->final_path);
+
+        /* In case this was a sparse file, make sure the file system is right */
+        if (i->written_uncompressed > 0) {
+                if (ftruncate(i->output_fd, i->written_uncompressed) < 0)
+                        return log_error_errno(errno, "Failed to truncate file: %m");
         }
 
-        r = tempfn_random(p, &tp);
+        r = raw_import_maybe_convert_qcow2(i);
         if (r < 0)
-                return log_oom();
-
-        dfd = open(tp, O_WRONLY|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664);
-        if (dfd < 0)
-                return log_error_errno(errno, "Failed to create writable copy of image: %m");
+                return r;
 
-        /* Turn off COW writing. This should greatly improve
-         * performance on COW file systems like btrfs, since it
-         * reduces fragmentation caused by not allowing in-place
-         * writes. */
-        r = chattr_fd(dfd, true, FS_NOCOW_FL);
-        if (r < 0)
-                log_warning_errno(errno, "Failed to set file attributes on %s: %m", tp);
+        if (S_ISREG(i->st.st_mode)) {
+                (void) copy_times(i->input_fd, i->output_fd);
+                (void) copy_xattr(i->input_fd, i->output_fd);
+        }
 
-        r = copy_bytes(i->raw_job->disk_fd, dfd, (off_t) -1, true);
-        if (r < 0) {
-                unlink(tp);
-                return log_error_errno(r, "Failed to make writable copy of image: %m");
+        if (i->read_only) {
+                r = import_make_read_only_fd(i->output_fd);
+                if (r < 0)
+                        return r;
         }
 
-        (void) copy_times(i->raw_job->disk_fd, dfd);
-        (void) copy_xattr(i->raw_job->disk_fd, dfd);
+        if (i->force_local)
+                (void) rm_rf(i->final_path, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME);
 
-        dfd = safe_close(dfd);
+        r = rename_noreplace(AT_FDCWD, i->temp_path, AT_FDCWD, i->final_path);
+        if (r < 0)
+                return log_error_errno(r, "Failed to move image into place: %m");
 
-        r = rename(tp, p);
-        if (r < 0)  {
-                unlink(tp);
-                return log_error_errno(errno, "Failed to move writable image into place: %m");
-        }
+        i->temp_path = mfree(i->temp_path);
 
-        log_info("Created new local image '%s'.", i->local);
         return 0;
 }
 
-static int raw_import_verify_sha256sum(RawImport *i) {
-        _cleanup_close_pair_ int gpg_pipe[2] = { -1, -1 };
-        _cleanup_free_ char *fn = NULL;
-        _cleanup_close_ int sig_file = -1;
-        const char *p, *line;
-        char sig_file_path[] = "/tmp/sigXXXXXX";
-        _cleanup_sigkill_wait_ pid_t pid = 0;
+static int raw_import_open_disk(RawImport *i) {
         int r;
 
         assert(i);
 
-        assert(i->raw_job);
+        assert(!i->final_path);
+        assert(!i->temp_path);
+        assert(i->output_fd < 0);
 
-        if (!i->sha256sums_job)
-                return 0;
-
-        assert(i->raw_job->state == IMPORT_JOB_DONE);
-        assert(i->raw_job->sha256);
-
-        assert(i->sha256sums_job->state == IMPORT_JOB_DONE);
-        assert(i->sha256sums_job->payload);
-        assert(i->sha256sums_job->payload_size > 0);
+        i->final_path = strjoin(i->image_root, "/", i->local, ".raw", NULL);
+        if (!i->final_path)
+                return log_oom();
 
-        r = import_url_last_component(i->raw_job->url, &fn);
+        r = tempfn_random(i->final_path, NULL, &i->temp_path);
         if (r < 0)
                 return log_oom();
 
-        if (!filename_is_valid(fn)) {
-                log_error("Cannot verify checksum, could not determine valid server-side file name.");
-                return -EBADMSG;
-        }
-
-        line = strappenda(i->raw_job->sha256, " *", fn, "\n");
-
-        p = memmem(i->sha256sums_job->payload,
-                   i->sha256sums_job->payload_size,
-                   line,
-                   strlen(line));
-
-        if (!p || (p != (char*) i->sha256sums_job->payload && p[-1] != '\n')) {
-                log_error("Checksum did not check out, payload has been tempered with.");
-                return -EBADMSG;
-        }
-
-        log_info("SHA256 checksum of %s is valid.", i->raw_job->url);
-
-        if (!i->signature_job)
-                return 0;
+        (void) mkdir_parents_label(i->temp_path, 0700);
 
-        assert(i->signature_job->state == IMPORT_JOB_DONE);
-        assert(i->signature_job->payload);
-        assert(i->signature_job->payload_size > 0);
+        i->output_fd = open(i->temp_path, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664);
+        if (i->output_fd < 0)
+                return log_error_errno(errno, "Failed to open destination %s: %m", i->temp_path);
 
-        r = pipe2(gpg_pipe, O_CLOEXEC);
+        r = chattr_fd(i->output_fd, FS_NOCOW_FL, FS_NOCOW_FL);
         if (r < 0)
-                return log_error_errno(errno, "Failed to create pipe: %m");
+                log_warning_errno(r, "Failed to set file attributes on %s: %m", i->temp_path);
 
-        sig_file = mkostemp(sig_file_path, O_RDWR);
-        if (sig_file < 0)
-                return log_error_errno(errno, "Failed to create temporary file: %m");
-
-        r = loop_write(sig_file, i->signature_job->payload, i->signature_job->payload_size, false);
-        if (r < 0) {
-                log_error_errno(r, "Failed to write to temporary file: %m");
-                goto finish;
-        }
+        return 0;
+}
 
-        pid = fork();
-        if (pid < 0)
-                return log_error_errno(errno, "Failed to fork off gpg: %m");
-        if (pid == 0) {
-                const char *cmd[] = {
-                        "gpg",
-                        "--no-options",
-                        "--no-default-keyring",
-                        "--no-auto-key-locate",
-                        "--no-auto-check-trustdb",
-                        "--batch",
-                        "--trust-model=always",
-                        "--keyring=" VENDOR_KEYRING_PATH,
-                        NULL, /* maybe user keyring */
-                        NULL, /* --verify */
-                        NULL, /* signature file */
-                        NULL, /* dash */
-                        NULL  /* trailing NULL */
-                };
-                unsigned k = ELEMENTSOF(cmd) - 5;
-                int null_fd;
-
-                /* Child */
-
-                reset_all_signal_handlers();
-                reset_signal_mask();
-                assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
-
-                gpg_pipe[1] = safe_close(gpg_pipe[1]);
-
-                if (dup2(gpg_pipe[0], STDIN_FILENO) != STDIN_FILENO) {
-                        log_error_errno(errno, "Failed to dup2() fd: %m");
-                        _exit(EXIT_FAILURE);
-                }
+static int raw_import_try_reflink(RawImport *i) {
+        off_t p;
+        int r;
 
-                if (gpg_pipe[0] != STDIN_FILENO)
-                        gpg_pipe[0] = safe_close(gpg_pipe[0]);
+        assert(i);
+        assert(i->input_fd >= 0);
+        assert(i->output_fd >= 0);
 
-                null_fd = open("/dev/null", O_WRONLY|O_NOCTTY);
-                if (null_fd < 0) {
-                        log_error_errno(errno, "Failed to open /dev/null: %m");
-                        _exit(EXIT_FAILURE);
-                }
+        if (i->compress.type != IMPORT_COMPRESS_UNCOMPRESSED)
+                return 0;
 
-                if (dup2(null_fd, STDOUT_FILENO) != STDOUT_FILENO) {
-                        log_error_errno(errno, "Failed to dup2() fd: %m");
-                        _exit(EXIT_FAILURE);
-                }
+        if (!S_ISREG(i->st.st_mode))
+                return 0;
 
-                if (null_fd != STDOUT_FILENO)
-                        null_fd = safe_close(null_fd);
+        p = lseek(i->input_fd, 0, SEEK_CUR);
+        if (p == (off_t) -1)
+                return log_error_errno(errno, "Failed to read file offset of input file: %m");
 
-                /* We add the user keyring only to the command line
-                 * arguments, if it's around since gpg fails
-                 * otherwise. */
-                if (access(USER_KEYRING_PATH, F_OK) >= 0)
-                        cmd[k++] = "--keyring=" USER_KEYRING_PATH;
+        /* Let's only try a btrfs reflink, if we are reading from the beginning of the file */
+        if ((uint64_t) p != (uint64_t) i->buffer_size)
+                return 0;
 
-                cmd[k++] = "--verify";
-                cmd[k++] = sig_file_path;
-                cmd[k++] = "-";
-                cmd[k++] = NULL;
+        r = btrfs_reflink(i->input_fd, i->output_fd);
+        if (r >= 0)
+                return 1;
 
-                execvp("gpg", (char * const *) cmd);
-                log_error_errno(errno, "Failed to execute gpg: %m");
-                _exit(EXIT_FAILURE);
-        }
+        return 0;
+}
 
-        gpg_pipe[0] = safe_close(gpg_pipe[0]);
+static int raw_import_write(const void *p, size_t sz, void *userdata) {
+        RawImport *i = userdata;
+        ssize_t n;
 
-        r = loop_write(gpg_pipe[1], i->sha256sums_job->payload, i->sha256sums_job->payload_size, false);
-        if (r < 0) {
-                log_error_errno(r, "Failed to write to pipe: %m");
-                goto finish;
+        if (i->grow_machine_directory && i->written_since_last_grow >= GROW_INTERVAL_BYTES) {
+                i->written_since_last_grow = 0;
+                grow_machine_directory();
         }
 
-        gpg_pipe[1] = safe_close(gpg_pipe[1]);
-
-        r = wait_for_terminate_and_warn("gpg", pid, true);
-        pid = 0;
-        if (r < 0)
-                goto finish;
-        if (r > 0) {
-                log_error("Signature verification failed.");
-                r = -EBADMSG;
-        } else {
-                log_info("Signature verification succeeded.");
-                r = 0;
-        }
+        n = sparse_write(i->output_fd, p, sz, 64);
+        if (n < 0)
+                return -errno;
+        if ((size_t) n < sz)
+                return -EIO;
 
-finish:
-        if (sig_file >= 0)
-                unlink(sig_file_path);
+        i->written_uncompressed += sz;
+        i->written_since_last_grow += sz;
 
-        return r;
+        return 0;
 }
 
-static void raw_import_job_on_finished(ImportJob *j) {
-        RawImport *i;
+static int raw_import_process(RawImport *i) {
+        ssize_t l;
         int r;
 
-        assert(j);
-        assert(j->userdata);
+        assert(i);
+        assert(i->buffer_size < sizeof(i->buffer));
 
-        i = j->userdata;
-        if (j->error != 0) {
-                if (j == i->sha256sums_job)
-                        log_error_errno(j->error, "Failed to retrieve SHA256 checksum, cannot verify. (Try --verify=no?)");
-                else if (j == i->signature_job)
-                        log_error_errno(j->error, "Failed to retrieve signature file, cannot verify. (Try --verify=no?)");
-                else
-                        log_error_errno(j->error, "Failed to retrieve image file. (Wrong URL?)");
+        l = read(i->input_fd, i->buffer + i->buffer_size, sizeof(i->buffer) - i->buffer_size);
+        if (l < 0) {
+                if (errno == EAGAIN)
+                        return 0;
 
-                r = j->error;
+                r = log_error_errno(errno, "Failed to read input file: %m");
                 goto finish;
         }
+        if (l == 0) {
+                if (i->compress.type == IMPORT_COMPRESS_UNKNOWN) {
+                        log_error("Premature end of file: %m");
+                        r = -EIO;
+                        goto finish;
+                }
 
-        /* This is invoked if either the download completed
-         * successfully, or the download was skipped because we
-         * already have the etag. In this case ->etag_exists is
-         * true.
-         *
-         * We only do something when we got all three files */
-
-        if (!IMPORT_JOB_STATE_IS_COMPLETE(i->raw_job))
-                return;
-        if (i->sha256sums_job && !IMPORT_JOB_STATE_IS_COMPLETE(i->sha256sums_job))
-                return;
-        if (i->signature_job && !IMPORT_JOB_STATE_IS_COMPLETE(i->signature_job))
-                return;
+                r = raw_import_finish(i);
+                goto finish;
+        }
 
-        if (!i->raw_job->etag_exists) {
-                assert(i->raw_job->disk_fd >= 0);
+        i->buffer_size += l;
 
-                r = raw_import_verify_sha256sum(i);
-                if (r < 0)
+        if (i->compress.type == IMPORT_COMPRESS_UNKNOWN) {
+                r = import_uncompress_detect(&i->compress, i->buffer, i->buffer_size);
+                if (r < 0) {
+                        log_error("Failed to detect file compression: %m");
                         goto finish;
+                }
+                if (r == 0) /* Need more data */
+                        return 0;
 
-                r = raw_import_maybe_convert_qcow2(i);
+                r = raw_import_open_disk(i);
                 if (r < 0)
                         goto finish;
 
-                r = import_make_read_only_fd(i->raw_job->disk_fd);
+                r = raw_import_try_reflink(i);
                 if (r < 0)
                         goto finish;
-
-                r = rename(i->temp_path, i->final_path);
-                if (r < 0) {
-                        r = log_error_errno(errno, "Failed to move RAW file into place: %m");
+                if (r > 0) {
+                        r = raw_import_finish(i);
                         goto finish;
                 }
-
-                free(i->temp_path);
-                i->temp_path = NULL;
         }
 
-        r = raw_import_make_local_copy(i);
-        if (r < 0)
+        r = import_uncompress(&i->compress, i->buffer, i->buffer_size, raw_import_write, i);
+        if (r < 0) {
+                log_error_errno(r, "Failed to decode and write: %m");
                 goto finish;
+        }
+
+        i->written_compressed += i->buffer_size;
+        i->buffer_size = 0;
 
-        r = 0;
+        raw_import_report_progress(i);
+
+        return 0;
 
 finish:
         if (i->on_finished)
                 i->on_finished(i, r, i->userdata);
         else
                 sd_event_exit(i->event, r);
-}
 
-static int raw_import_job_on_open_disk(ImportJob *j) {
-        RawImport *i;
-        int r;
-
-        assert(j);
-        assert(j->userdata);
-
-        i = j->userdata;
-
-        r = import_make_path(j->url, j->etag, i->image_root, ".raw-", ".raw", &i->final_path);
-        if (r < 0)
-                return log_oom();
+        return 0;
+}
 
-        r = tempfn_random(i->final_path, &i->temp_path);
-        if (r <0)
-                return log_oom();
+static int raw_import_on_input(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+        RawImport *i = userdata;
 
-        mkdir_parents_label(i->temp_path, 0700);
+        return raw_import_process(i);
+}
 
-        j->disk_fd = open(i->temp_path, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0644);
-        if (j->disk_fd < 0)
-                return log_error_errno(errno, "Failed to create %s: %m", i->temp_path);
+static int raw_import_on_defer(sd_event_source *s, void *userdata) {
+        RawImport *i = userdata;
 
-        r = chattr_fd(j->disk_fd, true, FS_NOCOW_FL);
-        if (r < 0)
-                log_warning_errno(errno, "Failed to set file attributes on %s: %m", i->temp_path);
-
-        return 0;
+        return raw_import_process(i);
 }
 
-int raw_import_pull(RawImport *i, const char *url, const char *local, bool force_local, ImportVerify verify) {
+int raw_import_start(RawImport *i, int fd, const char *local, bool force_local, bool read_only) {
         int r;
 
         assert(i);
-        assert(verify < _IMPORT_VERIFY_MAX);
-        assert(verify >= 0);
-
-        if (i->raw_job)
-                return -EBUSY;
-
-        if (!http_url_is_valid(url))
-                return -EINVAL;
+        assert(fd >= 0);
+        assert(local);
 
-        if (local && !machine_name_is_valid(local))
+        if (!machine_name_is_valid(local))
                 return -EINVAL;
 
-        r = free_and_strdup(&i->local, local);
-        if (r < 0)
-                return r;
-        i->force_local = force_local;
-        i->verify = verify;
+        if (i->input_fd >= 0)
+                return -EBUSY;
 
-        /* Queue job for the image itself */
-        r = import_job_new(&i->raw_job, url, i->glue, i);
+        r = fd_nonblock(fd, true);
         if (r < 0)
                 return r;
 
-        i->raw_job->on_finished = raw_import_job_on_finished;
-        i->raw_job->on_open_disk = raw_import_job_on_open_disk;
-        i->raw_job->calc_hash = true;
-
-        r = import_find_old_etags(url, i->image_root, DT_REG, ".raw-", ".raw", &i->raw_job->old_etags);
+        r = free_and_strdup(&i->local, local);
         if (r < 0)
                 return r;
+        i->force_local = force_local;
+        i->read_only = read_only;
 
-        if (verify != IMPORT_VERIFY_NO) {
-                _cleanup_free_ char *sha256sums_url = NULL;
-
-                /* Queue job for the SHA256SUMS file for the image */
-                r = import_url_change_last_component(url, "SHA256SUMS", &sha256sums_url);
-                if (r < 0)
-                        return r;
-
-                r = import_job_new(&i->sha256sums_job, sha256sums_url, i->glue, i);
-                if (r < 0)
-                        return r;
-
-                i->sha256sums_job->on_finished = raw_import_job_on_finished;
-                i->sha256sums_job->uncompressed_max = i->sha256sums_job->compressed_max = 1ULL * 1024ULL * 1024ULL;
-        }
-
-        if (verify == IMPORT_VERIFY_SIGNATURE) {
-                _cleanup_free_ char *sha256sums_sig_url = NULL;
+        if (fstat(fd, &i->st) < 0)
+                return -errno;
 
-                /* Queue job for the SHA256SUMS.gpg file for the image. */
-                r = import_url_change_last_component(url, "SHA256SUMS.gpg", &sha256sums_sig_url);
+        r = sd_event_add_io(i->event, &i->input_event_source, fd, EPOLLIN, raw_import_on_input, i);
+        if (r == -EPERM) {
+                /* This fd does not support epoll, for example because it is a regular file. Busy read in that case */
+                r = sd_event_add_defer(i->event, &i->input_event_source, raw_import_on_defer, i);
                 if (r < 0)
                         return r;
 
-                r = import_job_new(&i->signature_job, sha256sums_sig_url, i->glue, i);
-                if (r < 0)
-                        return r;
-
-                i->signature_job->on_finished = raw_import_job_on_finished;
-                i->signature_job->uncompressed_max = i->signature_job->compressed_max = 1ULL * 1024ULL * 1024ULL;
+                r = sd_event_source_set_enabled(i->input_event_source, SD_EVENT_ON);
         }
-
-        r = import_job_begin(i->raw_job);
         if (r < 0)
                 return r;
 
-        if (i->sha256sums_job) {
-                r = import_job_begin(i->sha256sums_job);
-                if (r < 0)
-                        return r;
-        }
-
-        if (i->signature_job) {
-                r = import_job_begin(i->signature_job);
-                if (r < 0)
-                        return r;
-        }
-
-        return 0;
+        i->input_fd = fd;
+        return r;
 }