From c33e405f20631ab5bbb9d3b326e805c57dc4fac5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 12 Jan 2021 18:49:11 +0100 Subject: [PATCH] import: mangle untarred OS images after pull-tar, too We do this for import-tar and import-fs, we should do it for pull-tar, too. Fixes: #17563 --- src/import/pull-tar.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index bbbd0f57a0e..b646d38539e 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -296,9 +296,8 @@ static void tar_pull_job_on_finished(PullJob *j) { goto finish; } - /* This is invoked if either the download completed - * successfully, or the download was skipped because we - * already have the etag. */ + /* This is invoked if either the download completed successfully, or the download was skipped because + * we already have the etag. */ if (!tar_pull_is_done(i)) return; @@ -340,6 +339,10 @@ static void tar_pull_job_on_finished(PullJob *j) { tar_pull_report_progress(i, TAR_FINALIZING); + r = import_mangle_os_tree(i->temp_path); + if (r < 0) + goto finish; + r = import_make_read_only(i->temp_path); if (r < 0) goto finish; -- 2.47.3