From f0be89eee9bf887bac87b59702bf688f691c2340 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 26 Dec 2014 18:18:47 +0100 Subject: import: properly remove pre-existing images if --force is used --- src/import/import-dkr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c index 1658053810..fbd64122f9 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; } -- cgit v1.2.3-54-g00ecf