diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-10-29 13:02:56 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-27 01:11:37 +0100 |
| commit | 7f0a55d4325f7df91f91b3b818f61f97d78df14a (patch) | |
| tree | f88b96f4a0002b49749d78622fd174d54062e9f8 /src/tmpfiles | |
| parent | journald: proceed even if some sockets are unknown (diff) | |
| download | systemd-7f0a55d4325f7df91f91b3b818f61f97d78df14a.tar.xz systemd-7f0a55d4325f7df91f91b3b818f61f97d78df14a.zip | |
Introduce CONF_DIRS_NULSTR helper to define standard conf dirs
Several different systemd tools define a nulstr containing a standard
series of configuration file directories, in /etc, /run, /usr/local/lib,
/usr/lib, and (#ifdef HAVE_SPLIT_USR) /lib. Factor that logic out into
a new helper macro, CONF_DIRS_NULSTR.
Diffstat (limited to 'src/tmpfiles')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 1e4675f87e..23fd6ca3bc 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -117,15 +117,7 @@ static char **arg_include_prefixes = NULL; static char **arg_exclude_prefixes = NULL; static char *arg_root = NULL; -static const char conf_file_dirs[] = - "/etc/tmpfiles.d\0" - "/run/tmpfiles.d\0" - "/usr/local/lib/tmpfiles.d\0" - "/usr/lib/tmpfiles.d\0" -#ifdef HAVE_SPLIT_USR - "/lib/tmpfiles.d\0" -#endif - ; +static const char conf_file_dirs[] = CONF_DIRS_NULSTR("tmpfiles"); #define MAX_DEPTH 256 |