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/boot/bootctl.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/boot/bootctl.c')
| -rw-r--r-- | src/boot/bootctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index bc1405145e..001cfa76fd 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -41,6 +41,7 @@ #include "efivars.h" #include "build.h" #include "util.h" +#include "rm-rf.h" static int verify_esp(const char *p, uint32_t *part, uint64_t *pstart, uint64_t *psize, sd_id128_t *uuid) { struct statfs sfs; @@ -1095,7 +1096,7 @@ static int remove_binaries(const char *esp_path) { return -ENOMEM; } - r = rm_rf(p, false, false, false); + r = rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL); free(p); q = remove_boot_efi(esp_path); |