summaryrefslogtreecommitdiff
path: root/src/modules-load
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-10-29 05:02:56 -0700
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-26 19:11:37 -0500
commit7f0a55d4325f7df91f91b3b818f61f97d78df14a (patch)
treef88b96f4a0002b49749d78622fd174d54062e9f8 /src/modules-load
parent3d82301321afdcc4f2f8786883bd15b1a64c6e83 (diff)
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/modules-load')
-rw-r--r--src/modules-load/modules-load.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 08de5e0ce9..c676fd1c18 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -38,15 +38,7 @@
static char **arg_proc_cmdline_modules = NULL;
-static const char conf_file_dirs[] =
- "/etc/modules-load.d\0"
- "/run/modules-load.d\0"
- "/usr/local/lib/modules-load.d\0"
- "/usr/lib/modules-load.d\0"
-#ifdef HAVE_SPLIT_USR
- "/lib/modules-load.d\0"
-#endif
- ;
+static const char conf_file_dirs[] = CONF_DIRS_NULSTR("modules-load");
static void systemd_kmod_log(void *data, int priority, const char *file, int line,
const char *fn, const char *format, va_list args) {