diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-12-26 18:18:47 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-12-26 19:33:15 +0100 |
| commit | f0be89eee9bf887bac87b59702bf688f691c2340 (patch) | |
| tree | 5fe766591c33574bdc25359050434ff23971f7b8 /src/import | |
| parent | 8620a9a32391fd74d70ddc07c9b79729ad4ec067 (diff) | |
import: properly remove pre-existing images if --force is used
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/import-dkr.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |