From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 26 Feb 2018 20:46:56 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=6112d6baf900fb4fde21a21eed4ddf3791e074fe;p=config%2Fbruni%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/libvirt/libvirtd.conf b/libvirt/libvirtd.conf
index 8a1b3a92..8e0c0d96 100644
--- a/libvirt/libvirtd.conf
+++ b/libvirt/libvirtd.conf
@@ -1,6 +1,6 @@
 # Master libvirt daemon configuration file
 #
-# For further information consult http://libvirt.org/format.html
+# For further information consult https://libvirt.org/format.html
 #
 # NOTE: the tests/daemon-conf regression test script requires
 # that each "PARAMETER = VALUE" line in this file have the parameter
diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf
index 2e8370a5..43dd561c 100644
--- a/libvirt/qemu.conf
+++ b/libvirt/qemu.conf
@@ -13,8 +13,9 @@
 #
 #  dh-params.pem - the DH params configuration file
 #
-# If the directory does not exist or contain the necessary files, QEMU
-# domains will fail to start if they are configured to use TLS.
+# If the directory does not exist, libvirtd will fail to start. If the
+# directory doesn't contain the necessary files, QEMU domains will fail
+# to start if they are configured to use TLS.
 #
 # In order to overwrite the default path alter the following. This path
 # definition will be used as the default path for other *_tls_x509_cert_dir
@@ -87,8 +88,9 @@
 
 # In order to override the default TLS certificate location for
 # vnc certificates, supply a valid path to the certificate directory.
-# If the provided path does not exist then the default_tls_x509_cert_dir
-# path will be used.
+# If the provided path does not exist, libvirtd will fail to start.
+# If the path is not provided, but vnc_tls = 1, then the
+# default_tls_x509_cert_dir path will be used.
 #
 #vnc_tls_x509_cert_dir = "/etc/pki/libvirt-vnc"
 
@@ -172,8 +174,9 @@
 
 # In order to override the default TLS certificate location for
 # spice certificates, supply a valid path to the certificate directory.
-# If the provided path does not exist then the default_tls_x509_cert_dir
-# path will be used.
+# If the provided path does not exist, libvirtd will fail to start.
+# If the path is not provided, but spice_tls = 1, then the
+# default_tls_x509_cert_dir path will be used.
 #
 #spice_tls_x509_cert_dir = "/etc/pki/libvirt-spice"
 
@@ -224,8 +227,9 @@
 
 # In order to override the default TLS certificate location for character
 # device TCP certificates, supply a valid path to the certificate directory.
-# If the provided path does not exist then the default_tls_x509_cert_dir
-# path will be used.
+# If the provided path does not exist, libvirtd will fail to start.
+# If the path is not provided, but chardev_tls = 1, then the
+# default_tls_x509_cert_dir path will be used.
 #
 #chardev_tls_x509_cert_dir = "/etc/pki/libvirt-chardev"
 
@@ -276,8 +280,9 @@
 # This is used to authenticate the VxHS block device clients to the VxHS
 # server.
 #
-# If the provided path does not exist then the default_tls_x509_cert_dir
-# path will be used.
+# If the provided path does not exist, libvirtd will fail to start.
+# If the path is not provided, but vxhs_tls = 1, then the
+# default_tls_x509_cert_dir path will be used.
 #
 # VxHS block device clients expect the client certificate and key to be
 # present in the certificate directory along with the CA master certificate.
@@ -294,7 +299,8 @@
 
 # In order to override the default TLS certificate location for migration
 # certificates, supply a valid path to the certificate directory. If the
-# provided path does not exist then the default_tls_x509_cert_dir path
+# provided path does not exist, libvirtd will fail to start. If the path is
+# not provided, but migrate_tls = 1, then the default_tls_x509_cert_dir path
 # will be used. Once/if a default certificate is enabled/defined, migration
 # will then be able to use the certificate via migration API flags.
 #
@@ -413,7 +419,7 @@
 
 # What cgroup controllers to make use of with QEMU guests
 #
-#  - 'cpu' - use for schedular tunables
+#  - 'cpu' - use for scheduler tunables
 #  - 'devices' - use for device whitelisting
 #  - 'memory' - use for memory tunables
 #  - 'blkio' - use for block devices I/O tunables
diff --git a/logrotate.d/libvirtd.libxl b/logrotate.d/libvirtd.libxl
index c531513e..4d957b6d 100644
--- a/logrotate.d/libvirtd.libxl
+++ b/logrotate.d/libvirtd.libxl
@@ -5,5 +5,4 @@
         compress
         delaycompress
         copytruncate
-        minsize 100k
 }
diff --git a/logrotate.d/libvirtd.lxc b/logrotate.d/libvirtd.lxc
index af0adc2e..9136c3a0 100644
--- a/logrotate.d/libvirtd.lxc
+++ b/logrotate.d/libvirtd.lxc
@@ -5,5 +5,4 @@
         compress
         delaycompress
         copytruncate
-        minsize 100k
 }
diff --git a/logrotate.d/libvirtd.qemu b/logrotate.d/libvirtd.qemu
index 6a866f9f..76e5809f 100644
--- a/logrotate.d/libvirtd.qemu
+++ b/logrotate.d/libvirtd.qemu
@@ -5,5 +5,4 @@
         compress
         delaycompress
         copytruncate
-        minsize 100k
 }
diff --git a/logrotate.d/libvirtd.uml b/logrotate.d/libvirtd.uml
index 441a905d..bf00c5dc 100644
--- a/logrotate.d/libvirtd.uml
+++ b/logrotate.d/libvirtd.uml
@@ -5,5 +5,4 @@
         compress
         delaycompress
         copytruncate
-        minsize 100k
 }