X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fimport%2Fimport-dkr.c;h=a3f390ca826da3abc094312eeba940b54186421c;hb=06a079055a68dd73150ed002fad7059ad3b41235;hp=b290619305552e7eb460486476b996a799d27a4a;hpb=10f9c75519671e7c7ab8993b54fe22da7c2d0c38;p=elogind.git

diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
index b29061930..a3f390ca8 100644
--- a/src/import/import-dkr.c
+++ b/src/import/import-dkr.c
@@ -94,6 +94,7 @@ struct DkrImport {
         CurlGlue *glue;
 
         char *index_url;
+        char *image_root;
 
         Hashmap *names;
         Hashmap *jobs;
@@ -406,22 +407,22 @@ static void dkr_import_name_maybe_finish(DkrImportName *name) {
 
                 assert(name->id);
 
-                p = strappenda("/var/lib/container/", name->local);
-                q = strappenda("/var/lib/container/.dkr-", name->id);
+                p = strappenda(name->import->image_root, "/", name->local);
+                q = strappenda(name->import->image_root, "/.dkr-", name->id);
 
                 if (name->force_local) {
                         (void) btrfs_subvol_remove(p);
-                        (void) rm_rf(p, false, true, false);
+                        (void) rm_rf_dangerous(p, false, true, false);
                 }
 
                 r = btrfs_subvol_snapshot(q, p, false, false);
                 if (r < 0) {
-                        log_error_errno(r, "Failed to snapshot final image: %m");
+                        log_error_errno(r, "Failed to snapshot local image: %m");
                         dkr_import_finish(name->import, r);
                         return;
                 }
 
-                log_info("Created new image %s.", p);
+                log_info("Created new local image %s.", p);
         }
 
         dkr_import_finish(name->import, 0);
@@ -534,7 +535,7 @@ static int dkr_import_name_pull_layer(DkrImportName *name) {
                         return 0;
                 }
 
-                path = strjoin("/var/lib/container/.dkr-", layer, NULL);
+                path = strjoin(name->import->image_root, "/.dkr-", layer, NULL);
                 if (!path)
                         return log_oom();
 
@@ -575,7 +576,7 @@ static int dkr_import_name_pull_layer(DkrImportName *name) {
         if (base) {
                 const char *base_path;
 
-                base_path = strappend("/var/lib/container/.dkr-", base);
+                base_path = strappenda(name->import->image_root, "/.dkr-", base);
                 r = btrfs_subvol_snapshot(base_path, temp, false, true);
         } else
                 r = btrfs_subvol_make(temp);
@@ -718,7 +719,7 @@ static void dkr_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result
         if (curl_easy_getinfo(curl, CURLINFO_PRIVATE, &job) != CURLE_OK)
                 return;
 
-        if (!job)
+        if (!job || job->done)
                 return;
 
         job->done = true;
@@ -817,6 +818,11 @@ static size_t dkr_import_job_write_callback(void *contents, size_t size, size_t
         assert(contents);
         assert(j);
 
+        if (j->done) {
+                r = -ESTALE;
+                goto fail;
+        }
+
         if (j->tar_stream) {
                 size_t l;
 
@@ -866,6 +872,11 @@ static size_t dkr_import_job_header_callback(void *contents, size_t size, size_t
         assert(contents);
         assert(j);
 
+        if (j->done) {
+                r = -ESTALE;
+                goto fail;
+        }
+
         r = curl_header_strdup(contents, sz, HEADER_TOKEN, &token);
         if (r < 0) {
                 log_oom();
@@ -1011,13 +1022,21 @@ static int dkr_import_name_begin(DkrImportName *name) {
         return dkr_import_name_add_job(name, DKR_IMPORT_JOB_IMAGES, url, &name->job_images);
 }
 
-int dkr_import_new(DkrImport **import, sd_event *event, const char *index_url, dkr_import_on_finished on_finished, void *userdata) {
+int dkr_import_new(
+                DkrImport **import,
+                sd_event *event,
+                const char *index_url,
+                const char *image_root,
+                dkr_import_on_finished on_finished,
+                void *userdata) {
+
         _cleanup_(dkr_import_unrefp) DkrImport *i = NULL;
         char *e;
         int r;
 
         assert(import);
         assert(dkr_url_is_valid(index_url));
+        assert(image_root);
 
         i = new0(DkrImport, 1);
         if (!i)
@@ -1030,6 +1049,10 @@ int dkr_import_new(DkrImport **import, sd_event *event, const char *index_url, d
         if (!i->index_url)
                 return -ENOMEM;
 
+        i->image_root = strdup(image_root);
+        if (!i->image_root)
+                return -ENOMEM;
+
         e = endswith(i->index_url, "/");
         if (e)
                 *e = 0;
@@ -1074,7 +1097,7 @@ DkrImport* dkr_import_unref(DkrImport *import) {
         sd_event_unref(import->event);
 
         free(import->index_url);
-
+        free(import->image_root);
         free(import);
 
         return NULL;