saving uncommitted changes in /etc prior to emerge run

diff --git a/libvirt/lxc.conf b/libvirt/lxc.conf
index 8df460174988a1ff7ccebedda17de28233835077..318a5366b4693cd5e41aace41d176ece59da8349 100644 (file)
--- a/libvirt/lxc.conf
+++ b/libvirt/lxc.conf
@@ -15,7 +15,7 @@
 
 # The default security driver is SELinux. If SELinux is disabled
 # on the host, then the security driver will automatically disable
-# itself. If you wish to disable QEMU SELinux security driver while
+# itself. If you wish to disable LXC SELinux security driver while
 # leaving SELinux enabled for the host in general, then set this
 # to 'none' instead.
 #

diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf
index e4c2aae2ecedd7a1030718de7cc2c8209cec8c90..2b2bd6031f7b3db244be51543a3df14d1a159d46 100644 (file)
--- a/libvirt/qemu.conf
+++ b/libvirt/qemu.conf
@@ -28,6 +28,20 @@
 #
 #default_tls_x509_verify = 1
 
+#
+# Libvirt assumes the server-key.pem file is unencrypted by default.
+# To use an encrypted server-key.pem file, the password to decrypt
+# the PEM file is required. This can be provided by creating a secret
+# object in libvirt and then to uncomment this setting to set the UUID
+# of the secret.
+#
+# NB This default all-zeros UUID will not work. Replace it with the
+# output from the UUID for the TLS secret from a 'virsh secret-list'
+# command and then uncomment the entry
+#
+#default_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
+
+
 # VNC is configured to listen on 127.0.0.1 by default.
 # To make it listen on all public interfaces, uncomment
 # this next option.
@@ -214,6 +228,16 @@
 #chardev_tls_x509_verify = 1
 
 
+# Uncomment and use the following option to override the default secret
+# UUID provided in the default_tls_x509_secret_uuid parameter.
+#
+# NB This default all-zeros UUID will not work. Replace it with the
+# output from the UUID for the TLS secret from a 'virsh secret-list'
+# command and then uncomment the entry
+#
+#chardev_tls_x509_secret_uuid = "00000000-0000-0000-0000-000000000000"
+
+
 # By default, if no graphical front end is configured, libvirt will disable
 # QEMU audio output since directly talking to alsa/pulseaudio may not work
 # with various security settings. If you know what you're doing, enable
@@ -621,3 +645,23 @@
 #          rollover when a size limit is hit.
 #
 #stdio_handler = "logd"
+
+# Qemu gluster libgfapi log level, debug levels are 0-9, with 9 being the
+# most verbose, and 0 representing no debugging output.
+#
+# The current logging levels defined in the gluster GFAPI are:
+#
+#    0 - None
+#    1 - Emergency
+#    2 - Alert
+#    3 - Critical
+#    4 - Error
+#    5 - Warning
+#    6 - Notice
+#    7 - Info
+#    8 - Debug
+#    9 - Trace
+#
+# Defaults to 4
+#
+#gluster_debug_level = 9