From ad2706db7cceba69203f3ac2b6ef65d7490c5f29 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 29 Nov 2016 22:50:21 +0100 Subject: core: rework logic to determine when we decide to add automatic deps for mounts This adds a concept of "extrinsic" mounts. If mounts are extrinsic we consider them managed by something else and do not add automatic ordering against umount.target, local-fs.target, remote-fs.target. Extrinsic mounts are considered: - All mounts if we are running in --user mode - API mounts such as everything below /proc, /sys, /dev, which exist from earliest boot to latest shutdown. - All mounts marked as initrd mounts, if we run on the host - The initrd's private directory /run/initrams that should survive until last reboot. This primarily merges a couple of different exclusion lists into a single concept. --- src/basic/path-util.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/basic/path-util.h') diff --git a/src/basic/path-util.h b/src/basic/path-util.h index d548f0c345..349cdac7d6 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -66,6 +66,18 @@ static inline bool path_equal_ptr(const char *a, const char *b) { _found; \ }) +#define PATH_STARTSWITH_SET(p, ...) \ + ({ \ + char **s; \ + bool _found = false; \ + STRV_FOREACH(s, STRV_MAKE(__VA_ARGS__)) \ + if (path_startswith(p, *s)) { \ + _found = true; \ + break; \ + } \ + _found; \ + }) + int path_strv_make_absolute_cwd(char **l); char** path_strv_resolve(char **l, const char *root); char** path_strv_resolve_uniq(char **l, const char *root); -- cgit v1.2.3-54-g00ecf