X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fimport%2Fimport.c;h=e457adf6294f640f24d49ed296011ecddf621572;hp=11d2e05f097fba1c39718c5c0bfc2c0010b5d397;hb=49bb233bb734536b9617d838f09a7bf9b8336003;hpb=91f4347ef7bde17418b365ed3a97a752fe65bd50 diff --git a/src/import/import.c b/src/import/import.c index 11d2e05f0..e457adf62 100644 --- a/src/import/import.c +++ b/src/import/import.c @@ -25,13 +25,112 @@ #include "event-util.h" #include "verbs.h" #include "build.h" +#include "import-raw.h" #include "import-dkr.h" static bool arg_force = false; +static const char *arg_image_root = "/var/lib/machines"; static const char* arg_dkr_index_url = DEFAULT_DKR_INDEX_URL; -static void on_finished(DkrImport *import, int error, void *userdata) { +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 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, *suffix; + 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; + + suffix = endswith(local, ".raw.xz"); + if (!suffix) + suffix = endswith(local, ".raw"); + if (!suffix) + suffix = endswith(local, ".xz"); + if (suffix) + local = strndupa(local, suffix - local); + + 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); @@ -63,6 +162,16 @@ static int pull_dkr(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 { @@ -73,28 +182,18 @@ static int pull_dkr(int argc, char *argv[], void *userdata) { local = name; } - if (streq(local, "-") || isempty(local)) + if (isempty(local) || streq(local, "-")) local = NULL; - 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 (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); @@ -115,11 +214,11 @@ static int pull_dkr(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 = dkr_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 = dkr_import_pull(import, arg_dkr_index_url, 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"); @@ -139,9 +238,11 @@ static int help(int argc, char *argv[], void *userdata) { " -h --help Show this help\n" " --version Show package version\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-dkr 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; @@ -153,6 +254,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_VERSION = 0x100, ARG_FORCE, ARG_DKR_INDEX_URL, + ARG_IMAGE_ROOT, }; static const struct option options[] = { @@ -160,6 +262,7 @@ static int parse_argv(int argc, char *argv[]) { { "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 }, {} }; @@ -193,6 +296,10 @@ static int parse_argv(int argc, char *argv[]) { arg_dkr_index_url = optarg; break; + case ARG_IMAGE_ROOT: + arg_image_root = optarg; + break; + case '?': return -EINVAL; @@ -208,6 +315,7 @@ static int import_main(int argc, char *argv[]) { static const Verb verbs[] = { { "help", VERB_ANY, VERB_ANY, 0, help }, { "pull-dkr", 2, 3, 0, pull_dkr }, + { "pull-raw", 2, 3, 0, pull_raw }, {} };