diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-20 16:32:23 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-20 16:36:29 +0100 |
| commit | bd0ce2447d4e8be510e605699f866605274d6c71 (patch) | |
| tree | 3066985aece26df16ce28150b6335c590989cc10 /src/tmpfiles | |
| parent | 09f467ac2482daa150b35e0a7c1fbddd726e4b10 (diff) | |
| download | systemd-bd0ce2447d4e8be510e605699f866605274d6c71.tar.gz | |
tmpfiles: also order glob child/parent relationships
This is necessary so that "r" can be nested and are always executed in
the same order.
Fixes: #10191
Diffstat (limited to 'src/tmpfiles')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index ea09abdb1c..acde15e2d8 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -3152,6 +3152,8 @@ static int link_parent(ItemArray *a) { ItemArray *j; j = ordered_hashmap_get(items, prefix); + if (!j) + j = ordered_hashmap_get(globs, prefix); if (j) { r = set_ensure_allocated(&j->children, NULL); if (r < 0) |