summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am4
-rw-r--r--src/import/import-raw.c (renamed from src/import/import-gpt.c)112
-rw-r--r--src/import/import-raw.h (renamed from src/import/import-gpt.h)16
-rw-r--r--src/import/import.c22
-rw-r--r--src/nspawn/nspawn.c2
-rw-r--r--src/shared/machine-image.c28
-rw-r--r--src/shared/machine-image.h2
7 files changed, 93 insertions, 93 deletions
diff --git a/Makefile.am b/Makefile.am
index 00218b77ba..520c4e944e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5218,8 +5218,8 @@ bin_PROGRAMS += \
systemd_import_SOURCES = \
src/import/import.c \
- src/import/import-gpt.c \
- src/import/import-gpt.h \
+ src/import/import-raw.c \
+ src/import/import-raw.h \
src/import/import-dkr.c \
src/import/import-dkr.h \
src/import/curl-util.c \
diff --git a/src/import/import-gpt.c b/src/import/import-raw.c
index d304a399fb..ac9e6eb847 100644
--- a/src/import/import-gpt.c
+++ b/src/import/import-raw.c
@@ -26,14 +26,14 @@
#include "hashmap.h"
#include "utf8.h"
#include "curl-util.h"
-#include "import-gpt.h"
+#include "import-raw.h"
#include "strv.h"
#include "copy.h"
-typedef struct GptImportFile GptImportFile;
+typedef struct RawImportFile RawImportFile;
-struct GptImportFile {
- GptImport *import;
+struct RawImportFile {
+ RawImport *import;
char *url;
char *local;
@@ -57,14 +57,14 @@ struct GptImportFile {
int disk_fd;
};
-struct GptImport {
+struct RawImport {
sd_event *event;
CurlGlue *glue;
char *image_root;
Hashmap *files;
- gpt_import_on_finished on_finished;
+ raw_import_on_finished on_finished;
void *userdata;
bool finished;
@@ -72,7 +72,7 @@ struct GptImport {
#define FILENAME_ESCAPE "/.#\"\'"
-static GptImportFile *gpt_import_file_unref(GptImportFile *f) {
+static RawImportFile *raw_import_file_unref(RawImportFile *f) {
if (!f)
return NULL;
@@ -98,9 +98,9 @@ static GptImportFile *gpt_import_file_unref(GptImportFile *f) {
return NULL;
}
-DEFINE_TRIVIAL_CLEANUP_FUNC(GptImportFile*, gpt_import_file_unref);
+DEFINE_TRIVIAL_CLEANUP_FUNC(RawImportFile*, raw_import_file_unref);
-static void gpt_import_finish(GptImport *import, int error) {
+static void raw_import_finish(RawImport *import, int error) {
assert(import);
if (import->finished)
@@ -114,7 +114,7 @@ static void gpt_import_finish(GptImport *import, int error) {
sd_event_exit(import->event, error);
}
-static int gpt_import_file_make_final_path(GptImportFile *f) {
+static int raw_import_file_make_final_path(RawImportFile *f) {
_cleanup_free_ char *escaped_url = NULL, *escaped_etag = NULL;
assert(f);
@@ -131,16 +131,16 @@ static int gpt_import_file_make_final_path(GptImportFile *f) {
if (!escaped_etag)
return -ENOMEM;
- f->final_path = strjoin(f->import->image_root, "/.gpt-", escaped_url, ".", escaped_etag, ".gpt", NULL);
+ f->final_path = strjoin(f->import->image_root, "/.raw-", escaped_url, ".", escaped_etag, ".raw", NULL);
} else
- f->final_path = strjoin(f->import->image_root, "/.gpt-", escaped_url, ".gpt", NULL);
+ f->final_path = strjoin(f->import->image_root, "/.raw-", escaped_url, ".raw", NULL);
if (!f->final_path)
return -ENOMEM;
return 0;
}
-static void gpt_import_file_success(GptImportFile *f) {
+static void raw_import_file_success(RawImportFile *f) {
int r;
assert(f);
@@ -158,7 +158,7 @@ static void gpt_import_file_success(GptImportFile *f) {
goto finish;
}
} else {
- r = gpt_import_file_make_final_path(f);
+ r = raw_import_file_make_final_path(f);
if (r < 0) {
log_oom();
goto finish;
@@ -171,7 +171,7 @@ static void gpt_import_file_success(GptImportFile *f) {
}
}
- p = strappenda(f->import->image_root, "/", f->local, ".gpt");
+ p = strappenda(f->import->image_root, "/", f->local, ".raw");
if (f->force_local)
(void) rm_rf_dangerous(p, false, true, false);
@@ -221,11 +221,11 @@ static void gpt_import_file_success(GptImportFile *f) {
r = 0;
finish:
- gpt_import_finish(f->import, r);
+ raw_import_finish(f->import, r);
}
-static void gpt_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result) {
- GptImportFile *f = NULL;
+static void raw_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result) {
+ RawImportFile *f = NULL;
struct stat st;
CURLcode code;
long status;
@@ -252,7 +252,7 @@ static void gpt_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result
goto fail;
} else if (status == 304) {
log_info("Image already downloaded. Skipping download.");
- gpt_import_file_success(f);
+ raw_import_file_success(f);
return;
} else if (status >= 300) {
log_error("HTTP request to %s failed with code %li.", f->url, status);
@@ -305,7 +305,7 @@ static void gpt_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result
r = rename(f->temp_path, f->final_path);
if (r < 0) {
- r = log_error_errno(errno, "Failed to move GPT file into place: %m");
+ r = log_error_errno(errno, "Failed to move RAW file into place: %m");
goto fail;
}
@@ -314,14 +314,14 @@ static void gpt_import_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result
log_info("Completed writing vendor image %s.", f->final_path);
- gpt_import_file_success(f);
+ raw_import_file_success(f);
return;
fail:
- gpt_import_finish(f->import, r);
+ raw_import_finish(f->import, r);
}
-static int gpt_import_file_open_disk_for_write(GptImportFile *f) {
+static int raw_import_file_open_disk_for_write(RawImportFile *f) {
int r;
assert(f);
@@ -329,7 +329,7 @@ static int gpt_import_file_open_disk_for_write(GptImportFile *f) {
if (f->disk_fd >= 0)
return 0;
- r = gpt_import_file_make_final_path(f);
+ r = raw_import_file_make_final_path(f);
if (r < 0)
return log_oom();
@@ -346,8 +346,8 @@ static int gpt_import_file_open_disk_for_write(GptImportFile *f) {
return 0;
}
-static size_t gpt_import_file_write_callback(void *contents, size_t size, size_t nmemb, void *userdata) {
- GptImportFile *f = userdata;
+static size_t raw_import_file_write_callback(void *contents, size_t size, size_t nmemb, void *userdata) {
+ RawImportFile *f = userdata;
size_t sz = size * nmemb;
ssize_t n;
int r;
@@ -360,7 +360,7 @@ static size_t gpt_import_file_write_callback(void *contents, size_t size, size_t
goto fail;
}
- r = gpt_import_file_open_disk_for_write(f);
+ r = raw_import_file_open_disk_for_write(f);
if (r < 0)
goto fail;
@@ -394,12 +394,12 @@ static size_t gpt_import_file_write_callback(void *contents, size_t size, size_t
return sz;
fail:
- gpt_import_finish(f->import, r);
+ raw_import_finish(f->import, r);
return 0;
}
-static size_t gpt_import_file_header_callback(void *contents, size_t size, size_t nmemb, void *userdata) {
- GptImportFile *f = userdata;
+static size_t raw_import_file_header_callback(void *contents, size_t size, size_t nmemb, void *userdata) {
+ RawImportFile *f = userdata;
size_t sz = size * nmemb;
_cleanup_free_ char *length = NULL, *last_modified = NULL;
char *etag;
@@ -424,7 +424,7 @@ static size_t gpt_import_file_header_callback(void *contents, size_t size, size_
if (strv_contains(f->old_etags, f->etag)) {
log_info("Image already downloaded. Skipping download.");
- gpt_import_file_success(f);
+ raw_import_file_success(f);
return sz;
}
@@ -454,7 +454,7 @@ static size_t gpt_import_file_header_callback(void *contents, size_t size, size_
return sz;
fail:
- gpt_import_finish(f->import, r);
+ raw_import_finish(f->import, r);
return 0;
}
@@ -469,7 +469,7 @@ static bool etag_is_valid(const char *etag) {
return true;
}
-static int gpt_import_file_find_old_etags(GptImportFile *f) {
+static int raw_import_file_find_old_etags(RawImportFile *f) {
_cleanup_free_ char *escaped_url = NULL;
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
@@ -495,7 +495,7 @@ static int gpt_import_file_find_old_etags(GptImportFile *f) {
de->d_type != DT_REG)
continue;
- a = startswith(de->d_name, ".gpt-");
+ a = startswith(de->d_name, ".raw-");
if (!a)
continue;
@@ -507,7 +507,7 @@ static int gpt_import_file_find_old_etags(GptImportFile *f) {
if (!a)
continue;
- b = endswith(de->d_name, ".gpt");
+ b = endswith(de->d_name, ".raw");
if (!b)
continue;
@@ -531,7 +531,7 @@ static int gpt_import_file_find_old_etags(GptImportFile *f) {
return 0;
}
-static int gpt_import_file_begin(GptImportFile *f) {
+static int raw_import_file_begin(RawImportFile *f) {
int r;
assert(f);
@@ -539,7 +539,7 @@ static int gpt_import_file_begin(GptImportFile *f) {
log_info("Getting %s.", f->url);
- r = gpt_import_file_find_old_etags(f);
+ r = raw_import_file_find_old_etags(f);
if (r < 0)
return r;
@@ -566,13 +566,13 @@ static int gpt_import_file_begin(GptImportFile *f) {
return -EIO;
}
- if (curl_easy_setopt(f->curl, CURLOPT_WRITEFUNCTION, gpt_import_file_write_callback) != CURLE_OK)
+ if (curl_easy_setopt(f->curl, CURLOPT_WRITEFUNCTION, raw_import_file_write_callback) != CURLE_OK)
return -EIO;
if (curl_easy_setopt(f->curl, CURLOPT_WRITEDATA, f) != CURLE_OK)
return -EIO;
- if (curl_easy_setopt(f->curl, CURLOPT_HEADERFUNCTION, gpt_import_file_header_callback) != CURLE_OK)
+ if (curl_easy_setopt(f->curl, CURLOPT_HEADERFUNCTION, raw_import_file_header_callback) != CURLE_OK)
return -EIO;
if (curl_easy_setopt(f->curl, CURLOPT_HEADERDATA, f) != CURLE_OK)
@@ -585,14 +585,14 @@ static int gpt_import_file_begin(GptImportFile *f) {
return 0;
}
-int gpt_import_new(GptImport **import, sd_event *event, const char *image_root, gpt_import_on_finished on_finished, void *userdata) {
- _cleanup_(gpt_import_unrefp) GptImport *i = NULL;
+int raw_import_new(RawImport **import, sd_event *event, const char *image_root, raw_import_on_finished on_finished, void *userdata) {
+ _cleanup_(raw_import_unrefp) RawImport *i = NULL;
int r;
assert(import);
assert(image_root);
- i = new0(GptImport, 1);
+ i = new0(RawImport, 1);
if (!i)
return -ENOMEM;
@@ -615,7 +615,7 @@ int gpt_import_new(GptImport **import, sd_event *event, const char *image_root,
if (r < 0)
return r;
- i->glue->on_finished = gpt_import_curl_on_finished;
+ i->glue->on_finished = raw_import_curl_on_finished;
i->glue->userdata = i;
*import = i;
@@ -624,14 +624,14 @@ int gpt_import_new(GptImport **import, sd_event *event, const char *image_root,
return 0;
}
-GptImport* gpt_import_unref(GptImport *import) {
- GptImportFile *f;
+RawImport* raw_import_unref(RawImport *import) {
+ RawImportFile *f;
if (!import)
return NULL;
while ((f = hashmap_steal_first(import->files)))
- gpt_import_file_unref(f);
+ raw_import_file_unref(f);
hashmap_free(import->files);
curl_glue_unref(import->glue);
@@ -643,8 +643,8 @@ GptImport* gpt_import_unref(GptImport *import) {
return NULL;
}
-int gpt_import_cancel(GptImport *import, const char *url) {
- GptImportFile *f;
+int raw_import_cancel(RawImport *import, const char *url) {
+ RawImportFile *f;
assert(import);
assert(url);
@@ -653,16 +653,16 @@ int gpt_import_cancel(GptImport *import, const char *url) {
if (!f)
return 0;
- gpt_import_file_unref(f);
+ raw_import_file_unref(f);
return 1;
}
-int gpt_import_pull(GptImport *import, const char *url, const char *local, bool force_local) {
- _cleanup_(gpt_import_file_unrefp) GptImportFile *f = NULL;
+int raw_import_pull(RawImport *import, const char *url, const char *local, bool force_local) {
+ _cleanup_(raw_import_file_unrefp) RawImportFile *f = NULL;
int r;
assert(import);
- assert(gpt_url_is_valid(url));
+ assert(raw_url_is_valid(url));
assert(!local || machine_name_is_valid(local));
if (hashmap_get(import->files, url))
@@ -672,7 +672,7 @@ int gpt_import_pull(GptImport *import, const char *url, const char *local, bool
if (r < 0)
return r;
- f = new0(GptImportFile, 1);
+ f = new0(RawImportFile, 1);
if (!f)
return -ENOMEM;
@@ -696,9 +696,9 @@ int gpt_import_pull(GptImport *import, const char *url, const char *local, bool
if (r < 0)
return r;
- r = gpt_import_file_begin(f);
+ r = raw_import_file_begin(f);
if (r < 0) {
- gpt_import_cancel(import, f->url);
+ raw_import_cancel(import, f->url);
f = NULL;
return r;
}
@@ -707,7 +707,7 @@ int gpt_import_pull(GptImport *import, const char *url, const char *local, bool
return 0;
}
-bool gpt_url_is_valid(const char *url) {
+bool raw_url_is_valid(const char *url) {
if (isempty(url))
return false;
diff --git a/src/import/import-gpt.h b/src/import/import-raw.h
index e9003db21a..5a38cdcc9e 100644
--- a/src/import/import-gpt.h
+++ b/src/import/import-raw.h
@@ -22,16 +22,16 @@
#include "sd-event.h"
#include "util.h"
-typedef struct GptImport GptImport;
+typedef struct RawImport RawImport;
-typedef void (*gpt_import_on_finished)(GptImport *import, int error, void *userdata);
+typedef void (*raw_import_on_finished)(RawImport *import, int error, void *userdata);
-int gpt_import_new(GptImport **import, sd_event *event, const char *image_root, gpt_import_on_finished on_finished, void *userdata);
-GptImport* gpt_import_unref(GptImport *import);
+int raw_import_new(RawImport **import, sd_event *event, const char *image_root, raw_import_on_finished on_finished, void *userdata);
+RawImport* raw_import_unref(RawImport *import);
-DEFINE_TRIVIAL_CLEANUP_FUNC(GptImport*, gpt_import_unref);
+DEFINE_TRIVIAL_CLEANUP_FUNC(RawImport*, raw_import_unref);
-int gpt_import_pull(GptImport *import, const char *url, const char *local, bool force_local);
-int gpt_import_cancel(GptImport *import, const char *name);
+int raw_import_pull(RawImport *import, const char *url, const char *local, bool force_local);
+int raw_import_cancel(RawImport *import, const char *name);
-bool gpt_url_is_valid(const char *url);
+bool raw_url_is_valid(const char *url);
diff --git a/src/import/import.c b/src/import/import.c
index c28ff8f8bf..669d7c152c 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -25,7 +25,7 @@
#include "event-util.h"
#include "verbs.h"
#include "build.h"
-#include "import-gpt.h"
+#include "import-raw.h"
#include "import-dkr.h"
static bool arg_force = false;
@@ -33,7 +33,7 @@ static const char *arg_image_root = "/var/lib/container";
static const char* arg_dkr_index_url = DEFAULT_DKR_INDEX_URL;
-static void on_gpt_finished(GptImport *import, int error, void *userdata) {
+static void on_raw_finished(RawImport *import, int error, void *userdata) {
sd_event *event = userdata;
assert(import);
@@ -45,14 +45,14 @@ static void on_gpt_finished(GptImport *import, int error, void *userdata) {
sd_event_exit(event, error);
}
-static int pull_gpt(int argc, char *argv[], void *userdata) {
- _cleanup_(gpt_import_unrefp) GptImport *import = NULL;
+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 (!gpt_url_is_valid(url)) {
+ if (!raw_url_is_valid(url)) {
log_error("URL '%s' is not valid.", url);
return -EINVAL;
}
@@ -79,7 +79,7 @@ static int pull_gpt(int argc, char *argv[], void *userdata) {
if (local) {
const char *p;
- suffix = endswith(local, ".gpt");
+ suffix = endswith(local, ".raw");
if (suffix)
local = strndupa(local, suffix - local);
@@ -88,7 +88,7 @@ static int pull_gpt(int argc, char *argv[], void *userdata) {
return -EINVAL;
}
- p = strappenda(arg_image_root, "/", local, ".gpt");
+ p = strappenda(arg_image_root, "/", local, ".raw");
if (laccess(p, F_OK) >= 0) {
if (!arg_force) {
log_info("Image '%s' already exists.", local);
@@ -109,11 +109,11 @@ static int pull_gpt(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 = gpt_import_new(&import, event, arg_image_root, on_gpt_finished, event);
+ 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 = gpt_import_pull(import, url, local, arg_force);
+ r = raw_import_pull(import, url, local, arg_force);
if (r < 0)
return log_error_errno(r, "Failed to pull image: %m");
@@ -238,7 +238,7 @@ static int help(int argc, char *argv[], void *userdata) {
" --dkr-index-url=URL Specify index URL to use for downloads\n\n"
"Commands:\n"
" pull-dkr REMOTE [NAME] Download a DKR image\n"
- " pull-gpt URL [NAME] Download a GPT image\n",
+ " pull-raw URL [NAME] Download a RAW image\n",
program_invocation_short_name);
return 0;
@@ -311,7 +311,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-gpt", 2, 3, 0, pull_gpt },
+ { "pull-raw", 2, 3, 0, pull_raw },
{}
};
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2783c97f20..2387c151ba 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3321,7 +3321,7 @@ static int determine_names(void) {
return -ENOENT;
}
- if (i->type == IMAGE_GPT)
+ if (i->type == IMAGE_RAW)
r = set_sanitized_path(&arg_image, i->path);
else
r = set_sanitized_path(&arg_directory, i->path);
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 752d658edb..a2f49e6e93 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -194,10 +194,10 @@ static int image_make(
return 1;
- } else if (S_ISREG(st.st_mode) && endswith(filename, ".gpt")) {
+ } else if (S_ISREG(st.st_mode) && endswith(filename, ".raw")) {
usec_t crtime = 0;
- /* It's a GPT block device */
+ /* It's a RAW disk image */
if (!ret)
return 1;
@@ -207,7 +207,7 @@ static int image_make(
if (!pretty)
pretty = strndupa(filename, strlen(filename) - 4);
- r = image_new(IMAGE_GPT,
+ r = image_new(IMAGE_RAW,
pretty,
path,
filename,
@@ -250,13 +250,13 @@ int image_find(const char *name, Image **ret) {
r = image_make(NULL, dirfd(d), path, name, ret);
if (r == 0 || r == -ENOENT) {
- _cleanup_free_ char *gpt = NULL;
+ _cleanup_free_ char *raw = NULL;
- gpt = strappend(name, ".gpt");
- if (!gpt)
+ raw = strappend(name, ".raw");
+ if (!raw)
return -ENOMEM;
- r = image_make(NULL, dirfd(d), path, gpt, ret);
+ r = image_make(NULL, dirfd(d), path, raw, ret);
if (r == 0 || r == -ENOENT)
continue;
}
@@ -366,7 +366,7 @@ int image_remove(Image *i) {
/* fall through */
- case IMAGE_GPT:
+ case IMAGE_RAW:
return rm_rf_dangerous(i->path, false, true, false);
default:
@@ -422,10 +422,10 @@ int image_rename(Image *i, const char *new_name) {
new_path = file_in_same_dir(i->path, new_name);
break;
- case IMAGE_GPT: {
+ case IMAGE_RAW: {
const char *fn;
- fn = strappenda(new_name, ".gpt");
+ fn = strappenda(new_name, ".raw");
new_path = file_in_same_dir(i->path, fn);
break;
}
@@ -491,8 +491,8 @@ int image_clone(Image *i, const char *new_name, bool read_only) {
r = btrfs_subvol_snapshot(i->path, new_path, read_only, true);
break;
- case IMAGE_GPT:
- new_path = strappenda("/var/lib/container/", new_name, ".gpt");
+ case IMAGE_RAW:
+ new_path = strappenda("/var/lib/container/", new_name, ".raw");
r = copy_file_atomic(i->path, new_path, read_only ? 0444 : 0644, false, FS_NOCOW_FL);
break;
@@ -545,7 +545,7 @@ int image_read_only(Image *i, bool b) {
break;
- case IMAGE_GPT: {
+ case IMAGE_RAW: {
struct stat st;
if (stat(i->path, &st) < 0)
@@ -654,7 +654,7 @@ bool image_name_is_valid(const char *s) {
static const char* const image_type_table[_IMAGE_TYPE_MAX] = {
[IMAGE_DIRECTORY] = "directory",
[IMAGE_SUBVOLUME] = "subvolume",
- [IMAGE_GPT] = "gpt",
+ [IMAGE_RAW] = "raw",
};
DEFINE_STRING_TABLE_LOOKUP(image_type, ImageType);
diff --git a/src/shared/machine-image.h b/src/shared/machine-image.h
index 4f41b4f307..c15b034321 100644
--- a/src/shared/machine-image.h
+++ b/src/shared/machine-image.h
@@ -27,7 +27,7 @@
typedef enum ImageType {
IMAGE_DIRECTORY,
IMAGE_SUBVOLUME,
- IMAGE_GPT,
+ IMAGE_RAW,
_IMAGE_TYPE_MAX,
_IMAGE_TYPE_INVALID = -1
} ImageType;
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-24 16:50:01 +0000