From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 26 Dec 2014 17:18:47 +0000 (+0100)
Subject: import: properly remove pre-existing images if --force is used
X-Git-Tag: v219~804
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f0be89eee9bf887bac87b59702bf688f691c2340

import: properly remove pre-existing images if --force is used
---

diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
index 165805381..fbd64122f 100644
--- a/src/import/import-dkr.c
+++ b/src/import/import-dkr.c
@@ -411,12 +411,12 @@ static void dkr_import_name_maybe_finish(DkrImportName *name) {
 
                 if (name->force_local) {
                         (void) btrfs_subvol_remove(p);
-                        (void) rm_rf(p, false, true, false);
+                        (void) rm_rf_dangerous(p, false, true, false);
                 }
 
                 r = btrfs_subvol_snapshot(q, p, false, false);
                 if (r < 0) {
-                        log_error_errno(r, "Failed to snapshot final image: %m");
+                        log_error_errno(r, "Failed to snapshot local image: %m");
                         dkr_import_finish(name->import, r);
                         return;
                 }