diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-04-04 11:52:57 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-04-06 10:57:53 +0200 |
| commit | c6878637502b1717a110a9a7e8bba32a8583fcdf (patch) | |
| tree | 44bd9f305f8f3b97a0c736c3ac549e568b6495cd /src/import/pull-raw.c | |
| parent | 2f653bded321fc2271edcda43d54fcc3e6c20dc9 (diff) | |
util: rework rm_rf() logic
- Move to its own file rm-rf.c
- Change parameters into a single flags parameter
- Remove "honour sticky" logic, it's unused these days
Diffstat (limited to 'src/import/pull-raw.c')
| -rw-r--r-- | src/import/pull-raw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index c0c6d57ead..e10b280b66 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -31,6 +31,7 @@ #include "util.h" #include "macro.h" #include "mkdir.h" +#include "rm-rf.h" #include "path-util.h" #include "import-util.h" #include "import-common.h" @@ -278,7 +279,7 @@ static int raw_pull_make_local_copy(RawPull *i) { if (i->force_local) { (void) btrfs_subvol_remove(p); - (void) rm_rf_dangerous(p, false, true, false); + (void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL); } r = tempfn_random(p, &tp); |