diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:06:48 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:32 -0500 |
| commit | 301af7e4853ad0281402f8d86f5a77c6cb7ce9f4 (patch) | |
| tree | e62b158e25d7d367e4b81899035782b0c1d2125f /src/journal | |
| parent | 396f9e2b327d702ea9502b80febf836283e19350 (diff) | |
coredump: Support coredump.conf.d directories in the usual search paths
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/coredump.c | 9 | ||||
| -rw-r--r-- | src/journal/coredump.conf | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/journal/coredump.c b/src/journal/coredump.c index d889ed1f8f..be45a684e5 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -120,10 +120,11 @@ static int parse_config(void) { {} }; - return config_parse(NULL, "/etc/systemd/coredump.conf", NULL, - "Coredump\0", - config_item_table_lookup, items, - false, false, true, NULL); + return config_parse_many("/etc/systemd/coredump.conf", + CONF_DIRS_NULSTR("systemd/coredump.conf"), + "Coredump\0", + config_item_table_lookup, items, + false, NULL); } static int fix_acl(int fd, uid_t uid) { diff --git a/src/journal/coredump.conf b/src/journal/coredump.conf index 0cc328f549..0fe9fe801a 100644 --- a/src/journal/coredump.conf +++ b/src/journal/coredump.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/coredump.conf.d/*.conf. +# # See coredump.conf(5) for details [Coredump] |