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/journal/journald-server.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/journal/journald-server.c')
| -rw-r--r-- | src/journal/journald-server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 2488884634..78d5b22ae1 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -31,6 +31,7 @@ #include "sd-messages.h" #include "sd-daemon.h" #include "mkdir.h" +#include "rm-rf.h" #include "hashmap.h" #include "journal-file.h" #include "socket-util.h" @@ -1088,7 +1089,7 @@ finish: s->runtime_journal = NULL; if (r >= 0) - rm_rf("/run/log/journal", false, true, false); + (void) rm_rf("/run/log/journal", REMOVE_ROOT); sd_journal_close(j); |