shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-24 02:03:54 +03:00
Code

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

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

6
Makefile-man.am
View File

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

21
man/bootchart.conf.xml
View File

@ -25,7 +25,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
<refentry id="bootchart.conf" conditional='ENABLE_BOOTCHART'>
<refentry id="bootchart.conf" conditional='ENABLE_BOOTCHART'
xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo>
<title>bootchart.conf</title>
<productname>systemd</productname>
@ -47,23 +48,31 @@
<refnamediv>
<refname>bootchart.conf</refname>
<refpurpose>Boot performance analysis graphing tool configuration file</refpurpose>
<refname>bootchart.conf.d</refname>
<refpurpose>Boot performance analysis graphing tool configuration files</refpurpose>
</refnamediv>
<refsynopsisdiv>
<para><filename>/etc/systemd/bootchart.conf</filename></para>
<para><filename>/etc/systemd/bootchart.conf.d/*.conf</filename></para>
<para><filename>/run/systemd/bootchart.conf.d/*.conf</filename></para>
<para><filename>/usr/lib/systemd/bootchart.conf.d/*.conf</filename></para>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
<para>When starting, systemd-bootchart will read the
configuration file <filename>bootchart.conf</filename>.
This configuration file determines logging parameters and
graph output.</para>
configuration file
<filename>/etc/systemd/bootchart.conf</filename>, followed by
the files in the <filename>bootchart.conf.d</filename>
directories. These configuration files determine logging
parameters and graph output.</para>
</refsect1>
<xi:include href="standard-conf.xml" xpointer="confd" />
<xi:include href="standard-conf.xml" xpointer="conf" />
<refsect1>
<title>Options</title>

7
src/bootchart/bootchart.c
View File

@ -125,10 +125,9 @@ static void parse_conf(void) {
{ NULL, NULL, NULL, 0, NULL }
};
config_parse(NULL, BOOTCHART_CONF, NULL,
NULL,
config_item_table_lookup, items,
true, false, true, NULL);
config_parse_many(BOOTCHART_CONF,
CONF_DIRS_NULSTR("systemd/bootchart.conf"),
NULL, config_item_table_lookup, items, true, NULL);
if (init != NULL)
strscpy(arg_init_path, sizeof(arg_init_path), init);

3
src/bootchart/bootchart.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/bootchart.conf.d/*.conf.
#
# See bootchart.conf(5) for details
[Bootchart]