From 7f0a55d4325f7df91f91b3b818f61f97d78df14a Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Wed, 29 Oct 2014 05:02:56 -0700 Subject: 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. --- src/modules-load/modules-load.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/modules-load') 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) { -- cgit v1.2.3-54-g00ecf