diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:06:20 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:31 -0500 |
| commit | a9edaeff8481573764288ccf7e433a95b6dc7c03 (patch) | |
| tree | 3fe088cac9fd69e73a2f98b9702b6b1c72859c4a /src/journal | |
| parent | 1b907b5c3b11491b790e541dd24255a758511a2f (diff) | |
journald: Support journald.conf.d directories in the usual search paths
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journald-server.c | 9 | ||||
| -rw-r--r-- | src/journal/journald.conf | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 9ec425d2d..3bee18b35 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1351,10 +1351,11 @@ static int server_parse_proc_cmdline(Server *s) { static int server_parse_config_file(Server *s) { assert(s); - return config_parse(NULL, "/etc/systemd/journald.conf", NULL, - "Journal\0", - config_item_perf_lookup, journald_gperf_lookup, - false, false, true, s); + return config_parse_many("/etc/systemd/journald.conf", + CONF_DIRS_NULSTR("systemd/journald.conf"), + "Journal\0", + config_item_perf_lookup, journald_gperf_lookup, + false, s); } static int server_dispatch_sync(sd_event_source *es, usec_t t, void *userdata) { diff --git a/src/journal/journald.conf b/src/journal/journald.conf index 2073f1bf2..29bdf8f18 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -5,6 +5,9 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. # +# You can override the directives in this file by creating files in +# /etc/systemd/journald.conf.d/*.conf. +# # See journald.conf(5) for details [Journal] |