X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fimport%2Fimport.c;h=af8d0ec42b27e1ad479d5f643ad52eb18103d8e4;hp=9bade38c3a2ed90d57e229997e8c59eadb41e703;hb=edce2aed3aa93b84f7b4c70412bdb665da2977b0;hpb=72648326ea6d3e68cdb0b5890df737047d031a41 diff --git a/src/import/import.c b/src/import/import.c index 9bade38c3..af8d0ec42 100644 --- a/src/import/import.c +++ b/src/import/import.c @@ -25,11 +25,148 @@ #include "event-util.h" #include "verbs.h" #include "build.h" -#include "import-dck.h" +#include "import-raw.h" +#include "import-dkr.h" static bool arg_force = false; +static const char *arg_image_root = "/var/lib/machines"; -static void on_finished(DckImport *import, int error, void *userdata) { +static const char* arg_dkr_index_url = DEFAULT_DKR_INDEX_URL; + +static void on_raw_finished(RawImport *import, int error, void *userdata) { + sd_event *event = userdata; + assert(import); + + if (error == 0) + log_info("Operation completed successfully."); + else + log_info_errno(error, "Operation failed: %m"); + + sd_event_exit(event, error); +} + +static int strip_raw_suffixes(const char *p, char **ret) { + static const char suffixes[] = + ".xz\0" + ".raw\0" + ".qcow2\0" + ".img\0"; + + _cleanup_free_ char *q = NULL; + + q = strdup(p); + if (!q) + return -ENOMEM; + + for (;;) { + const char *sfx; + bool changed = false; + + NULSTR_FOREACH(sfx, suffixes) { + char *e; + + e = endswith(q, sfx); + if (e) { + *e = 0; + changed = true; + } + } + + if (!changed) + break; + } + + *ret = q; + q = NULL; + + return 0; +} + +static int pull_raw(int argc, char *argv[], void *userdata) { + _cleanup_(raw_import_unrefp) RawImport *import = NULL; + _cleanup_event_unref_ sd_event *event = NULL; + const char *url, *local; + _cleanup_free_ char *l = NULL; + int r; + + url = argv[1]; + if (!raw_url_is_valid(url)) { + log_error("URL '%s' is not valid.", url); + return -EINVAL; + } + + if (argc >= 3) + local = argv[2]; + else { + const char *e, *p; + + e = url + strlen(url); + while (e > url && e[-1] == '/') + e--; + + p = e; + while (p > url && p[-1] != '/') + p--; + + local = strndupa(p, e - p); + } + + if (isempty(local) || streq(local, "-")) + local = NULL; + + if (local) { + const char *p; + + r = strip_raw_suffixes(local, &l); + if (r < 0) + return log_oom(); + + local = l; + + if (!machine_name_is_valid(local)) { + log_error("Local image name '%s' is not valid.", local); + return -EINVAL; + } + + p = strappenda(arg_image_root, "/", local, ".raw"); + if (laccess(p, F_OK) >= 0) { + if (!arg_force) { + log_info("Image '%s' already exists.", local); + return 0; + } + } else if (errno != ENOENT) + return log_error_errno(errno, "Can't check if image '%s' already exists: %m", local); + + log_info("Pulling '%s', saving as '%s'.", url, local); + } else + log_info("Pulling '%s'.", url); + + r = sd_event_default(&event); + if (r < 0) + return log_error_errno(r, "Failed to allocate event loop: %m"); + + assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); + sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL); + sd_event_add_signal(event, NULL, SIGINT, NULL, NULL); + + r = raw_import_new(&import, event, arg_image_root, on_raw_finished, event); + if (r < 0) + return log_error_errno(r, "Failed to allocate importer: %m"); + + r = raw_import_pull(import, url, local, arg_force); + if (r < 0) + return log_error_errno(r, "Failed to pull image: %m"); + + r = sd_event_loop(event); + if (r < 0) + return log_error_errno(r, "Failed to run event loop: %m"); + + log_info("Exiting."); + + return 0; +} + +static void on_dkr_finished(DkrImport *import, int error, void *userdata) { sd_event *event = userdata; assert(import); @@ -41,12 +178,17 @@ static void on_finished(DckImport *import, int error, void *userdata) { sd_event_exit(event, error); } -static int pull_dck(int argc, char *argv[], void *userdata) { - _cleanup_(dck_import_unrefp) DckImport *import = NULL; +static int pull_dkr(int argc, char *argv[], void *userdata) { + _cleanup_(dkr_import_unrefp) DkrImport *import = NULL; _cleanup_event_unref_ sd_event *event = NULL; const char *name, *tag, *local; int r; + if (!arg_dkr_index_url) { + log_error("Please specify an index URL with --dkr-index-url="); + return -EINVAL; + } + tag = strchr(argv[1], ':'); if (tag) { name = strndupa(argv[1], tag - argv[1]); @@ -56,6 +198,16 @@ static int pull_dck(int argc, char *argv[], void *userdata) { tag = "latest"; } + if (!dkr_name_is_valid(name)) { + log_error("Remote name '%s' is not valid.", name); + return -EINVAL; + } + + if (!dkr_tag_is_valid(tag)) { + log_error("Tag name '%s' is not valid.", tag); + return -EINVAL; + } + if (argc >= 3) local = argv[2]; else { @@ -66,28 +218,18 @@ static int pull_dck(int argc, char *argv[], void *userdata) { local = name; } - if (streq(local, "-") || isempty(local)) + if (isempty(local) || streq(local, "-")) local = NULL; - if (!dck_name_is_valid(name)) { - log_error("Remote name '%s' is not valid.", name); - return -EINVAL; - } - - if (!dck_tag_is_valid(tag)) { - log_error("Tag name '%s' is not valid.", tag); - return -EINVAL; - } - if (local) { const char *p; - if (!machine_name_is_valid(tag)) { + if (!machine_name_is_valid(local)) { log_error("Local image name '%s' is not valid.", local); return -EINVAL; } - p = strappenda("/var/lib/container/", local); + p = strappenda(arg_image_root, "/", local); if (laccess(p, F_OK) >= 0) { if (!arg_force) { log_info("Image '%s' already exists.", local); @@ -108,11 +250,11 @@ static int pull_dck(int argc, char *argv[], void *userdata) { sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL); sd_event_add_signal(event, NULL, SIGINT, NULL, NULL); - r = dck_import_new(&import, event, on_finished, event); + r = dkr_import_new(&import, event, arg_dkr_index_url, arg_image_root, on_dkr_finished, event); if (r < 0) return log_error_errno(r, "Failed to allocate importer: %m"); - r = dck_import_pull(import, name, tag, local, arg_force); + r = dkr_import_pull(import, name, tag, local, arg_force); if (r < 0) return log_error_errno(r, "Failed to pull image: %m"); @@ -131,9 +273,12 @@ static int help(int argc, char *argv[], void *userdata) { "Import container or virtual machine image.\n\n" " -h --help Show this help\n" " --version Show package version\n" - " --force Force creation of image\n\n" + " --force Force creation of image\n" + " --image-root= Image root directory\n" + " --dkr-index-url=URL Specify index URL to use for downloads\n\n" "Commands:\n" - " pull-dck REMOTE [NAME] Download an image\n", + " pull-dkr REMOTE [NAME] Download a DKR image\n" + " pull-raw URL [NAME] Download a RAW image\n", program_invocation_short_name); return 0; @@ -144,12 +289,16 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_FORCE, + ARG_DKR_INDEX_URL, + ARG_IMAGE_ROOT, }; static const struct option options[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, ARG_VERSION }, { "force", no_argument, NULL, ARG_FORCE }, + { "dkr-index-url", required_argument, NULL, ARG_DKR_INDEX_URL }, + { "image-root", required_argument, NULL, ARG_IMAGE_ROOT }, {} }; @@ -163,7 +312,7 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - return help(argc, argv, NULL); + return help(0, NULL, NULL); case ARG_VERSION: puts(PACKAGE_STRING); @@ -174,6 +323,19 @@ static int parse_argv(int argc, char *argv[]) { arg_force = true; break; + case ARG_DKR_INDEX_URL: + if (!dkr_url_is_valid(optarg)) { + log_error("Index URL is not valid: %s", optarg); + return -EINVAL; + } + + arg_dkr_index_url = optarg; + break; + + case ARG_IMAGE_ROOT: + arg_image_root = optarg; + break; + case '?': return -EINVAL; @@ -186,9 +348,10 @@ static int parse_argv(int argc, char *argv[]) { static int import_main(int argc, char *argv[]) { - const Verb verbs[] = { + static const Verb verbs[] = { { "help", VERB_ANY, VERB_ANY, 0, help }, - { "pull-dck", 2, 3, 0, pull_dck }, + { "pull-dkr", 2, 3, 0, pull_dkr }, + { "pull-raw", 2, 3, 0, pull_raw }, {} };