diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-09-17 10:00:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 10:00:19 +0200 |
| commit | 6ac288a990251b39218fa219f03a2048124b9352 (patch) | |
| tree | ffb840c43202f5d9b479045e59652e4862a96000 /src/journal | |
| parent | 0b493a02631d08bd2f48db8bc618dcd1fe3bdcb3 (diff) | |
| parent | 881e6b5edfd6ff82e0683678f19c887cbacab344 (diff) | |
Merge pull request #4123 from keszybz/network-file-dropins
Network file dropins
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journald-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 3507910919..cc352dbae2 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1474,7 +1474,7 @@ static int server_parse_proc_cmdline(Server *s) { static int server_parse_config_file(Server *s) { assert(s); - return config_parse_many(PKGSYSCONFDIR "/journald.conf", + return config_parse_many_nulstr(PKGSYSCONFDIR "/journald.conf", CONF_PATHS_NULSTR("systemd/journald.conf.d"), "Journal\0", config_item_perf_lookup, journald_gperf_lookup, |