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@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in
index b8a99272e68545045010319e1bb11f3490b85071..23aae991a25dc7761c755f666eb5180fd317c554 100644 (file)
--- 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 6545dc58d3777fb9ae521ffb314f2511d4fa5cfd..6466be3b8d8e9f0638511cf11ff63ba5dc32fc0a 100644 (file)
--- 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@/libvirt/qemu.conf``
+* ``@SYSCONFDIR@/libvirt/qemu.conf`` for the QEMU driver
+* ``@SYSCONFDIR@/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 b9aca6c8577991f962e5200feb2cab92d29e4d0a..2e9d8fd14bbbb734bb735af0467ff79fdb48e9b0 100644 (file)
--- 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@/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``