if (error == 0)
log_info("Operation completed successfully.");
- else
- log_error_errno(error, "Operation failed: %m");
- sd_event_exit(event, error);
+ sd_event_exit(event, EXIT_FAILURE);
}
static int strip_tar_suffixes(const char *name, char **ret) {
char *s;
e = endswith(name, ".tar");
+ if (!e)
+ e = endswith(name, ".tar.xz");
if (!e)
e = endswith(name, ".tar.gz");
if (!e)
- e = endswith(name, ".tar.xz");
+ e = endswith(name, ".tar.bz2");
if (!e)
e = endswith(name, ".tgz");
if (!e)
if (r < 0)
return log_error_errno(r, "Failed to allocate importer: %m");
- r = tar_import_pull(import, url, local, arg_force);
+ r = tar_import_pull(import, url, local, arg_force, arg_verify);
if (r < 0)
return log_error_errno(r, "Failed to pull image: %m");
log_info("Exiting.");
- return 0;
+ return r;
}
static void on_raw_finished(RawImport *import, int error, void *userdata) {
if (error == 0)
log_info("Operation completed successfully.");
- else
- log_error_errno(error, "Operation failed: %m");
- sd_event_exit(event, error);
+ sd_event_exit(event, EXIT_FAILURE);
}
static int strip_raw_suffixes(const char *p, char **ret) {
static const char suffixes[] =
".xz\0"
+ ".gz\0"
+ ".bz2\0"
".raw\0"
".qcow2\0"
- ".img\0";
+ ".img\0"
+ ".bin\0";
_cleanup_free_ char *q = NULL;
log_info("Exiting.");
- return 0;
+ return r;
}
static void on_dkr_finished(DkrImport *import, int error, void *userdata) {