1 files changed, 156 insertions, 14 deletions

diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index d38a2158c4..563765d83d 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -55,6 +55,7 @@ struct TarPull {
         char *image_root;
 
         PullJob *tar_job;
+        PullJob *settings_job;
         PullJob *checksum_job;
         PullJob *signature_job;
 
@@ -64,11 +65,15 @@ struct TarPull {
         char *local;
         bool force_local;
         bool grow_machine_directory;
+        bool settings;
 
         pid_t tar_pid;
 
-        char *temp_path;
         char *final_path;
+        char *temp_path;
+
+        char *settings_path;
+        char *settings_temp_path;
 
         ImportVerify verify;
 };
@@ -83,6 +88,7 @@ TarPull* tar_pull_unref(TarPull *i) {
         }
 
         pull_job_unref(i->tar_job);
+        pull_job_unref(i->settings_job);
         pull_job_unref(i->checksum_job);
         pull_job_unref(i->signature_job);
 
@@ -94,7 +100,13 @@ TarPull* tar_pull_unref(TarPull *i) {
                 free(i->temp_path);
         }
 
+        if (i->settings_temp_path) {
+                (void) unlink(i->settings_temp_path);
+                free(i->settings_temp_path);
+        }
+
         free(i->final_path);
+        free(i->settings_path);
         free(i->image_root);
         free(i->local);
         free(i);
@@ -113,7 +125,6 @@ int tar_pull_new(
         int r;
 
         assert(ret);
-        assert(event);
 
         i = new0(TarPull, 1);
         if (!i)
@@ -128,7 +139,13 @@ int tar_pull_new(
 
         i->grow_machine_directory = path_startswith(i->image_root, "/var/lib/machines");
 
-        i->event = sd_event_ref(event);
+        if (event)
+                i->event = sd_event_ref(event);
+        else {
+                r = sd_event_default(&i->event);
+                if (r < 0)
+                        return r;
+        }
 
         r = curl_glue_new(&i->glue, i->event);
         if (r < 0)
@@ -155,6 +172,11 @@ static void tar_pull_report_progress(TarPull *i, TarProgress p) {
 
                 percent = 0;
 
+                if (i->settings_job) {
+                        percent += i->settings_job->progress_percent * 5 / 100;
+                        remain -= 5;
+                }
+
                 if (i->checksum_job) {
                         percent += i->checksum_job->progress_percent * 5 / 100;
                         remain -= 5;
@@ -209,6 +231,27 @@ static int tar_pull_make_local_copy(TarPull *i) {
         if (r < 0)
                 return r;
 
+        if (i->settings) {
+                const char *local_settings;
+                assert(i->settings_job);
+
+                if (!i->settings_path) {
+                        r = pull_make_path(i->settings_job->url, i->settings_job->etag, i->image_root, ".settings-", NULL, &i->settings_path);
+                        if (r < 0)
+                                return log_oom();
+                }
+
+                local_settings = strjoina(i->image_root, "/", i->local, ".nspawn");
+
+                r = copy_file_atomic(i->settings_path, local_settings, 0664, i->force_local, 0);
+                if (r == -EEXIST)
+                        log_warning_errno(r, "Settings file %s already exists, not replacing.", local_settings);
+                else if (r < 0 && r != -ENOENT)
+                        log_warning_errno(r, "Failed to copy settings files %s: %m", local_settings);
+
+                log_info("Create new settings file '%s.nspawn'", i->local);
+        }
+
         return 0;
 }
 
@@ -216,11 +259,13 @@ static bool tar_pull_is_done(TarPull *i) {
         assert(i);
         assert(i->tar_job);
 
-        if (i->tar_job->state != PULL_JOB_DONE)
+        if (!PULL_JOB_IS_COMPLETE(i->tar_job))
                 return false;
-        if (i->checksum_job && i->checksum_job->state != PULL_JOB_DONE)
+        if (i->settings_job && !PULL_JOB_IS_COMPLETE(i->settings_job))
                 return false;
-        if (i->signature_job && i->signature_job->state != PULL_JOB_DONE)
+        if (i->checksum_job && !PULL_JOB_IS_COMPLETE(i->checksum_job))
+                return false;
+        if (i->signature_job && !PULL_JOB_IS_COMPLETE(i->signature_job))
                 return false;
 
         return true;
@@ -234,7 +279,11 @@ static void tar_pull_job_on_finished(PullJob *j) {
         assert(j->userdata);
 
         i = j->userdata;
-        if (j->error != 0) {
+
+        if (j == i->settings_job) {
+                if (j->error != 0)
+                        log_info_errno(j->error, "Settings file could not be retrieved, proceeding without.");
+        } else if (j->error != 0) {
                 if (j == i->checksum_job)
                         log_error_errno(j->error, "Failed to retrieve SHA256 checksum, cannot verify. (Try --verify=no?)");
                 else if (j == i->signature_job)
@@ -253,13 +302,19 @@ static void tar_pull_job_on_finished(PullJob *j) {
         if (!tar_pull_is_done(i))
                 return;
 
-        j->disk_fd = safe_close(i->tar_job->disk_fd);
+        i->tar_job->disk_fd = safe_close(i->tar_job->disk_fd);
+        if (i->settings_job)
+                i->settings_job->disk_fd = safe_close(i->settings_job->disk_fd);
 
         if (i->tar_pid > 0) {
                 r = wait_for_terminate_and_warn("tar", i->tar_pid, true);
                 i->tar_pid = 0;
                 if (r < 0)
                         goto finish;
+                if (r > 0) {
+                        r = -EIO;
+                        goto finish;
+                }
         }
 
         if (!i->tar_job->etag_exists) {
@@ -267,7 +322,7 @@ static void tar_pull_job_on_finished(PullJob *j) {
 
                 tar_pull_report_progress(i, TAR_VERIFYING);
 
-                r = pull_verify(i->tar_job, i->checksum_job, i->signature_job);
+                r = pull_verify(i->tar_job, i->settings_job, i->checksum_job, i->signature_job);
                 if (r < 0)
                         goto finish;
 
@@ -283,8 +338,32 @@ static void tar_pull_job_on_finished(PullJob *j) {
                         goto finish;
                 }
 
-                free(i->temp_path);
-                i->temp_path = NULL;
+                i->temp_path = mfree(i->temp_path);
+
+                if (i->settings_job &&
+                    i->settings_job->error == 0 &&
+                    !i->settings_job->etag_exists) {
+
+                        assert(i->settings_temp_path);
+                        assert(i->settings_path);
+
+                        /* Also move the settings file into place, if
+                         * it exist. Note that we do so only if we
+                         * also moved the tar file in place, to keep
+                         * things strictly in sync. */
+
+                        r = import_make_read_only(i->settings_temp_path);
+                        if (r < 0)
+                                goto finish;
+
+                        r = rename_noreplace(AT_FDCWD, i->settings_temp_path, AT_FDCWD, i->settings_path);
+                        if (r < 0) {
+                                log_error_errno(r, "Failed to rename settings file: %m");
+                                goto finish;
+                        }
+
+                        i->settings_temp_path = mfree(i->settings_temp_path);
+                }
         }
 
         tar_pull_report_progress(i, TAR_COPYING);
@@ -302,7 +381,7 @@ finish:
                 sd_event_exit(i->event, r);
 }
 
-static int tar_pull_job_on_open_disk(PullJob *j) {
+static int tar_pull_job_on_open_disk_tar(PullJob *j) {
         TarPull *i;
         int r;
 
@@ -339,6 +418,35 @@ static int tar_pull_job_on_open_disk(PullJob *j) {
         return 0;
 }
 
+static int tar_pull_job_on_open_disk_settings(PullJob *j) {
+        TarPull *i;
+        int r;
+
+        assert(j);
+        assert(j->userdata);
+
+        i = j->userdata;
+        assert(i->settings_job == j);
+        assert(!i->settings_path);
+        assert(!i->settings_temp_path);
+
+        r = pull_make_path(j->url, j->etag, i->image_root, ".settings-", NULL, &i->settings_path);
+        if (r < 0)
+                return log_oom();
+
+        r = tempfn_random(i->settings_path, NULL, &i->settings_temp_path);
+        if (r < 0)
+                return log_oom();
+
+        mkdir_parents_label(i->settings_temp_path, 0700);
+
+        j->disk_fd = open(i->settings_temp_path, O_RDWR|O_CREAT|O_EXCL|O_NOCTTY|O_CLOEXEC, 0664);
+        if (j->disk_fd < 0)
+                return log_error_errno(errno, "Failed to create %s: %m", i->settings_temp_path);
+
+        return 0;
+}
+
 static void tar_pull_job_on_progress(PullJob *j) {
         TarPull *i;
 
@@ -350,10 +458,19 @@ static void tar_pull_job_on_progress(PullJob *j) {
         tar_pull_report_progress(i, TAR_DOWNLOADING);
 }
 
-int tar_pull_start(TarPull *i, const char *url, const char *local, bool force_local, ImportVerify verify) {
+int tar_pull_start(
+                TarPull *i,
+                const char *url,
+                const char *local,
+                bool force_local,
+                ImportVerify verify,
+                bool settings) {
+
         int r;
 
         assert(i);
+        assert(verify < _IMPORT_VERIFY_MAX);
+        assert(verify >= 0);
 
         if (!http_url_is_valid(url))
                 return -EINVAL;
@@ -367,15 +484,18 @@ int tar_pull_start(TarPull *i, const char *url, const char *local, bool force_lo
         r = free_and_strdup(&i->local, local);
         if (r < 0)
                 return r;
+
         i->force_local = force_local;
         i->verify = verify;
+        i->settings = settings;
 
+        /* Set up download job for TAR file */
         r = pull_job_new(&i->tar_job, url, i->glue, i);
         if (r < 0)
                 return r;
 
         i->tar_job->on_finished = tar_pull_job_on_finished;
-        i->tar_job->on_open_disk = tar_pull_job_on_open_disk;
+        i->tar_job->on_open_disk = tar_pull_job_on_open_disk_tar;
         i->tar_job->on_progress = tar_pull_job_on_progress;
         i->tar_job->calc_checksum = verify != IMPORT_VERIFY_NO;
         i->tar_job->grow_machine_directory = i->grow_machine_directory;
@@ -384,6 +504,22 @@ int tar_pull_start(TarPull *i, const char *url, const char *local, bool force_lo
         if (r < 0)
                 return r;
 
+        /* Set up download job for the settings file (.nspawn) */
+        if (settings) {
+                r = pull_make_settings_job(&i->settings_job, url, i->glue, tar_pull_job_on_finished, i);
+                if (r < 0)
+                        return r;
+
+                i->settings_job->on_open_disk = tar_pull_job_on_open_disk_settings;
+                i->settings_job->on_progress = tar_pull_job_on_progress;
+                i->settings_job->calc_checksum = verify != IMPORT_VERIFY_NO;
+
+                r = pull_find_old_etags(i->settings_job->url, i->image_root, DT_REG, ".settings-", NULL, &i->settings_job->old_etags);
+                if (r < 0)
+                        return r;
+        }
+
+        /* Set up download of checksum/signature files */
         r = pull_make_verification_jobs(&i->checksum_job, &i->signature_job, verify, url, i->glue, tar_pull_job_on_finished, i);
         if (r < 0)
                 return r;
@@ -392,6 +528,12 @@ int tar_pull_start(TarPull *i, const char *url, const char *local, bool force_lo
         if (r < 0)
                 return r;
 
+        if (i->settings_job) {
+                r = pull_job_begin(i->settings_job);
+                if (r < 0)
+                        return r;
+        }
+
         if (i->checksum_job) {
                 i->checksum_job->on_progress = tar_pull_job_on_progress;