diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-11-10 15:57:21 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-10 17:31:31 +0100 |
| commit | 75eb615480afd787fa412f0a529523f568f79b26 (patch) | |
| tree | 6e617b5565f2e40c746d33c3c91b95daf4ff0687 /src/modules-load | |
| parent | b1f044bbc45cc05049eed9c483a2d6bef73c0adc (diff) | |
| download | systemd-75eb615480afd787fa412f0a529523f568f79b26.tar.gz systemd-75eb615480afd787fa412f0a529523f568f79b26.tar.bz2 systemd-75eb615480afd787fa412f0a529523f568f79b26.zip | |
defs: rework CONF_DIRS_NULSTR() macro
The macro is generically useful for putting together search paths, hence
let's make it truly generic, by dropping the implicit ".d" appending it
does, and leave that to the caller. Also rename it from
CONF_DIRS_NULSTR() to CONF_PATHS_NULSTR(), since it's not strictly about
dirs that way, but any kind of file system path.
Also, mark CONF_DIR_SPLIT_USR() as internal macro by renaming it to
_CONF_PATHS_SPLIT_USR() so that the leading underscore indicates that
it's internal.
Diffstat (limited to 'src/modules-load')
| -rw-r--r-- | src/modules-load/modules-load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 13784763f1..a7fdcb09cf 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -38,7 +38,7 @@ static char **arg_proc_cmdline_modules = NULL; -static const char conf_file_dirs[] = CONF_DIRS_NULSTR("modules-load"); +static const char conf_file_dirs[] = CONF_PATHS_NULSTR("modules-load.d"); static void systemd_kmod_log(void *data, int priority, const char *file, int line, const char *fn, const char *format, va_list args) { |