[PATCH 3/5] docs: Document lxc.conf location
This is similar to my earlier commit which documented qemu.conf
locations. Luckily, the LXC driver has only the system connection
and not session or embed one.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
docs/drvlxc.html.in | 10 ++++++++++
docs/manpages/libvirtd.rst | 16 +++++++++-------
docs/manpages/virtlxcd.rst | 9 +++++++++
3 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in
index b8a99272e6..23aae991a2 100644
--- a/docs/drvlxc.html.in
+++ b/docs/drvlxc.html.in
@@ -281,6 +281,16 @@ causes libvirt to activate the user namespace feature.
</p>
+<h2><a id="configFiles">Location of configuration
files</a></h2>
+
+<p>
+The LXC driver comes with sane default values. However, during its
+initialization it reads a configuration file which offers system
+administrator to override some of that default. The file is located
+under <code>/etc/libvirt/lxc.conf</code>
+</p>
+
+
<h2><a id="activation">Systemd Socket Activation
Integration</a></h2>
<p>
diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst
index 6545dc58d3..6466be3b8d 100644
--- a/docs/manpages/libvirtd.rst
+++ b/docs/manpages/libvirtd.rst
@@ -136,15 +136,17 @@ When run as *root*
The default configuration file used by ``libvirtd``, unless overridden on the
command line using the ``-f`` | ``--config`` option.
-If QEMU driver is installed, then the following file is also read:
+Depending on what driver is installed, then the following files are also read:
-* ``@SYSCONFDIR(a)/libvirt/qemu.conf``
+* ``@SYSCONFDIR(a)/libvirt/qemu.conf`` for the QEMU driver
+* ``@SYSCONFDIR(a)/libvirt/lxc.conf`` for the LXC driver
-This file contains various knobs and default values for virtual machines
-created within QEMU driver, and offers a way to override the built in defaults,
-for instance (but not limited to): paths to various supplementary binaries, TLS
-certificates location, graphical consoles configuration and others. Location of
-this file can't be overridden by any command line switch.
+These files contain various knobs and default values for virtual machines
+created within their respective drivers, and offer a way to override the built
+in defaults, for instance (but not limited to): paths to various supplementary
+binaries, TLS certificates location, graphical consoles configuration and
+others. Location of neither of these files can be overridden by any command
+line switch.
* ``@RUNSTATEDIR@/libvirt/libvirt-sock``
* ``@RUNSTATEDIR@/libvirt/libvirt-sock-ro``
diff --git a/docs/manpages/virtlxcd.rst b/docs/manpages/virtlxcd.rst
index b9aca6c857..2e9d8fd14b 100644
--- a/docs/manpages/virtlxcd.rst
+++ b/docs/manpages/virtlxcd.rst
@@ -111,6 +111,15 @@ a different user results in error.
The default configuration file used by ``virtlxcd``, unless overridden on the
command line using the ``-f`` | ``--config`` option.
+In addition to the default configuration file, ``virtlxcd`` reads
+configuration for the LXC driver from:
+
+* ``@SYSCONFDIR(a)/libvirt/lxc.conf``
+
+This file contains various knobs and default values for virtual machines
+created within LXC driver, and offers a way to override the built in defaults,
+Location of this file can't be overridden by any command line switch.
+
* ``@RUNSTATEDIR@/libvirt/virtlxcd-sock``
* ``@RUNSTATEDIR@/libvirt/virtlxcd-sock-ro``
* ``@RUNSTATEDIR@/libvirt/virtlxcd-admin-sock``
--
2.26.2