shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 10:25:37 +03:00
Code

coredump: Support coredump.conf.d directories in the usual search paths

Browse Source
This commit is contained in:
Josh Triplett 2014-11-29 01:06:48 -08:00 committed by Zbigniew Jędrzejewski-Szmek
parent 396f9e2b32
commit 301af7e485
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile-man.am
View File

@ -714,8 +714,10 @@ MANPAGES += \
man/coredumpctl.1 \
man/systemd-coredump.8
MANPAGES_ALIAS += \
#
man/coredump.conf.d.5
man/coredump.conf.d.5: man/coredump.conf.5
man/coredump.conf.d.html: man/coredump.conf.html
$(html-alias)
endif

14
man/coredump.conf.xml
View File

@ -22,7 +22,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
<refentry id="coredump.conf" conditional="ENABLE_COREDUMP">
<refentry id="coredump.conf" conditional="ENABLE_COREDUMP"
xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>coredump.conf</title>
<productname>systemd</productname>
@ -44,20 +45,27 @@
<refnamediv>
<refname>coredump.conf</refname>
<refpurpose>Coredump storage configuration file</refpurpose>
<refname>coredump.conf.d</refname>
<refpurpose>Coredump storage configuration files</refpurpose>
</refnamediv>
<refsynopsisdiv>
<para><filename>/etc/systemd/coredump.conf</filename></para>
<para><filename>/etc/systemd/coredump.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/coredump.conf.d/*.conf</filename></para>
<para><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
<para>This file configures the behaviour of <command>systemd-coredump</command>,
<para>These files configure the behaviour of <command>systemd-coredump</command>,
a handler for core dumps invoked by the kernel.</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<refsect1>
<title>Options</title>

9
src/journal/coredump.c
View File

@ -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) {

3
src/journal/coredump.conf
View File

@ -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]