summaryrefslogtreecommitdiff
path: root/man/bootchart.conf.xml
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-11-29 01:06:41 -0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-29 13:55:32 -0500
commit396f9e2b327d702ea9502b80febf836283e19350 (patch)
treef749cbfe9b5d1dc01c64ad7445051e7d06590071 /man/bootchart.conf.xml
parent778b6a3f8888ec9496143c92c8cbf95f5c891df9 (diff)
bootchart: Support bootchart.conf.d directories in the usual search paths
Diffstat (limited to 'man/bootchart.conf.xml')
-rw-r--r--man/bootchart.conf.xml21
1 files changed, 15 insertions, 6 deletions
diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
index 68834c73b7..a364826bb0 100644
--- a/man/bootchart.conf.xml
+++ b/man/bootchart.conf.xml
@@ -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>