picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tmpfiles: always remove/clean-up before creating

Browse source 
Let's always clean the platform before we build something new.

Fixes: #9508
This commit is contained in:
Lennart Poettering 2018-10-26 21:19:36 +02:00
parent 21af33863f
commit 64adb37968
1 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/tmpfiles/tmpfiles.c
View file

@ -3162,11 +3162,11 @@ static int link_parent(ItemArray *a) {
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int r, k, r_process = 0;
ItemArray *a;
Iterator iterator;
_cleanup_strv_free_ char **config_dirs = NULL; _cleanup_strv_free_ char **config_dirs = NULL;
int r, k, r_process = 0, phase;
bool invalid_config = false; bool invalid_config = false;
Iterator iterator;
ItemArray *a;
r = parse_argv(argc, argv); r = parse_argv(argc, argv);
if (r <= 0) if (r <= 0)
@ -3242,20 +3242,34 @@ int main(int argc, char *argv[]) {
goto finish; goto finish;
} }
/* The non-globbing ones usually create things, hence we apply /* If multiple operations are requested, let's first run the remove/clean operations, and only then the create
* them first */ * operations. i.e. that we first clean out the platform we then build on. */
ORDERED_HASHMAP_FOREACH(a, items, iterator) { for (phase = 0; phase < 2; phase++) {
k = process_item_array(a, arg_operation); OperationMask op;
if (k < 0 && r_process == 0)
r_process = k;
}
/* The globbing ones usually alter things, hence we apply them if (phase == 0)
* second. */ op = arg_operation & (OPERATION_REMOVE|OPERATION_CLEAN);
ORDERED_HASHMAP_FOREACH(a, globs, iterator) { else if (phase == 1)
k = process_item_array(a, arg_operation); op = arg_operation & OPERATION_CREATE;
if (k < 0 && r_process == 0) else
r_process = k; assert_not_reached("unexpected phase");
if (op == 0) /* Nothing requested in this phase */
continue;
/* The non-globbing ones usually create things, hence we apply them first */
ORDERED_HASHMAP_FOREACH(a, items, iterator) {
k = process_item_array(a, op);
if (k < 0 && r_process == 0)
r_process = k;
}
/* The globbing ones usually alter things, hence we apply them second. */
ORDERED_HASHMAP_FOREACH(a, globs, iterator) {
k = process_item_array(a, op);
if (k < 0 && r_process == 0)
r_process = k;
}
} }
finish: finish: