summaryrefslogtreecommitdiff
path: root/man/bootchart.conf.xml
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2015-06-18 22:27:50 +0200
committerKay Sievers <kay@vrfy.org>2015-06-18 22:27:50 +0200
commit6433d440729d22f5954ea1bf9c828bbad04e0838 (patch)
tree2c99d171a99820d08bc2618cf7a17d60e573abc9 /man/bootchart.conf.xml
parent38489ef8b2998e2015de629d80932ffcb6a2e78c (diff)
parent12b42c76672a66c2d4ea7212c14f8f1b5a62b78d (diff)
Merge pull request #293 from teg/man-revert
man: revert dynamic paths for split-usr setups
Diffstat (limited to 'man/bootchart.conf.xml')
-rw-r--r--man/bootchart.conf.xml17
1 files changed, 7 insertions, 10 deletions
diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
index b383f6e24d..bf6ca0bf9e 100644
--- a/man/bootchart.conf.xml
+++ b/man/bootchart.conf.xml
@@ -1,9 +1,6 @@
<?xml version='1.0'?> <!--*-nxml-*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!--
This file is part of systemd.
@@ -55,17 +52,17 @@
</refnamediv>
<refsynopsisdiv>
- <para><filename>&pkgsysconfdir;/bootchart.conf</filename></para>
- <para><filename>&pkgsysconfdir;/bootchart.conf.d/*.conf</filename></para>
+ <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>&rootlibexecdir;/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>&pkgsysconfdir;/bootchart.conf</filename>, followed by
+ 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>
@@ -125,10 +122,10 @@
<term><varname>Init=[path]</varname></term>
<listitem><para>Configures bootchart to run a non-standard
binary instead of
- <filename>&rootlibexecdir;/systemd</filename>. This option is
+ <filename>/usr/lib/systemd/systemd</filename>. This option is
only relevant if bootchart was invoked from the kernel command
line with
- init=&rootlibexecdir;/systemd-bootchart.</para></listitem>
+ init=/usr/lib/systemd/systemd-bootchart.</para></listitem>
</varlistentry>
<varlistentry>