diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-10 21:01:35 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-10 21:01:35 +0100 |
| commit | e3c4a681db0b7004904b95d55fd1a443161c9397 (patch) | |
| tree | a5b08abba6a533a3c4fc2a8f1bb9097957580c46 /src/core/main.c | |
| parent | 092b6e188b6b75be4450c6f20fc82599dcaf9552 (diff) | |
| parent | de7399eb7427da46c5cd355181080274f69567a2 (diff) | |
Merge pull request #1835 from poettering/grabbag-of-stuff
Lots of small fixes
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/main.c b/src/core/main.c index 950315e857..a86080642d 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -682,8 +682,14 @@ static int parse_config_file(void) { const char *fn, *conf_dirs_nulstr; - fn = arg_running_as == MANAGER_SYSTEM ? PKGSYSCONFDIR "/system.conf" : PKGSYSCONFDIR "/user.conf"; - conf_dirs_nulstr = arg_running_as == MANAGER_SYSTEM ? CONF_DIRS_NULSTR("systemd/system.conf") : CONF_DIRS_NULSTR("systemd/user.conf"); + fn = arg_running_as == MANAGER_SYSTEM ? + PKGSYSCONFDIR "/system.conf" : + PKGSYSCONFDIR "/user.conf"; + + conf_dirs_nulstr = arg_running_as == MANAGER_SYSTEM ? + CONF_PATHS_NULSTR("systemd/system.conf.d") : + CONF_PATHS_NULSTR("systemd/user.conf.d"); + config_parse_many(fn, conf_dirs_nulstr, "Manager\0", config_item_table_lookup, items, false, NULL); |