chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8620a9a
)
import: properly remove pre-existing images if --force is used
author
Lennart Poettering
<lennart@poettering.net>
Fri, 26 Dec 2014 17:18:47 +0000
(18:18 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 26 Dec 2014 18:33:15 +0000
(19:33 +0100)
src/import/import-dkr.c
patch
|
blob
|
history
diff --git
a/src/import/import-dkr.c
b/src/import/import-dkr.c
index 16580538102d8465026a5ce79ec94787defc2334..fbd64122f9eff5aabd863ff90f5531e157ebebe4 100644
(file)
--- 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);
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) {
}
r = btrfs_subvol_snapshot(q, p, false, false);
if (r < 0) {
- log_error_errno(r, "Failed to snapshot
fin
al image: %m");
+ log_error_errno(r, "Failed to snapshot
loc
al image: %m");
dkr_import_finish(name->import, r);
return;
}
dkr_import_finish(name->import, r);
return;
}