From a9edaeff8481573764288ccf7e433a95b6dc7c03 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Sat, 29 Nov 2014 01:06:20 -0800
Subject: journald: Support journald.conf.d directories in the usual search
 paths

---
 src/journal/journald-server.c | 9 +++++----
 src/journal/journald.conf     | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 9ec425d2d4..3bee18b35b 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 2073f1bf21..29bdf8f183 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]
-- 
cgit v1.2.3-54-g00ecf