From 1910cd0e05f7661986680e0a4472f4e857f90787 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Jun 2014 01:37:35 +0200 Subject: tmpfiles: when processing lines, always process prefixes before suffixes If two lines refer to paths that are suffix and prefix of each other, then always process the prefix first, the suffix second. In all other cases strictly process rules in the order they appear in the files. This makes creating /var/run as symlink to /run a lot more fun, since it is automatically created first. --- src/tmpfiles/tmpfiles.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/tmpfiles') diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index d68693f829..c6121bccf3 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -101,6 +101,8 @@ typedef struct Item { bool age_set:1; bool keep_first_level:1; + + bool done:1; } Item; static bool arg_create = false; @@ -977,9 +979,23 @@ static int clean_item(Item *i) { static int process_item(Item *i) { int r, q, p; + char prefix[PATH_MAX]; assert(i); + if (i->done) + return 0; + + i->done = true; + + PATH_FOREACH_PREFIX(prefix, i->path) { + Item *j; + + j = hashmap_get(items, prefix); + if (j) + process_item(j); + } + r = arg_create ? create_item(i) : 0; q = arg_remove ? remove_item(i) : 0; p = arg_clean ? clean_item(i) : 0; -- cgit v1.2.3-54-g00ecf