saving uncommitted changes in /etc prior to emerge run

diff --git a/libvirt/libvirtd.conf b/libvirt/libvirtd.conf
index 91b3f47deccfd7da294c5355f7b0f1793700e6c0..9c0080dc06eb4b8f9d98490f7f63c755d0238a17 100644 (file)
--- a/libvirt/libvirtd.conf
+++ b/libvirt/libvirtd.conf
@@ -366,7 +366,9 @@
 #    4: ERROR
 #
 # Multiple filters can be defined in a single @filters, they just need to be
-# separated by spaces.
+# separated by spaces. Note that libvirt performs "first" match, i.e. if
+# there are concurrent filters, the first one that matches will be applied,
+# given the order in log_filters.
 #
 # e.g. to only get warning or errors from the remote layer and only errors
 # from the event layer:
@@ -394,13 +396,6 @@
 #log_outputs="3:syslog:libvirtd"
 #
 
-# Log debug buffer size:
-#
-# This configuration option is no longer used, since the global
-# log buffer functionality has been removed. Please configure
-# suitable log_outputs/log_filters settings to obtain logs.
-#log_buffer_size = 64
-
 
 ##################################################################
 #

diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf
index 43dd561cca90114b86e0cdd036c34d6a1dba6ef2..34441857bd420515175abe8a1ecc7dd094a24cd7 100644 (file)
--- a/libvirt/qemu.conf
+++ b/libvirt/qemu.conf
@@ -541,7 +541,7 @@
 
 
 # If clear_emulator_capabilities is enabled, libvirt will drop all
-# privileged capabilities of the QEmu/KVM emulator. This is enabled by
+# privileged capabilities of the QEMU/KVM emulator. This is enabled by
 # default.
 #
 # Warning: Disabling this option means that a compromised guest can
@@ -669,9 +669,13 @@
 
 
 
-# Use seccomp syscall whitelisting in QEMU.
-# 1 = on, 0 = off, -1 = use QEMU default
-# Defaults to -1.
+# Use seccomp syscall sandbox in QEMU.
+# 1 == seccomp enabled, 0 == seccomp disabled
+#
+# If it is unset (or -1), then seccomp will be enabled
+# only if QEMU >= 2.11.0 is detected, otherwise it is
+# left disabled. This ensures the default config gets
+# protection for new QEMU using the blacklist approach.
 #
 #seccomp_sandbox = 1
 

diff --git a/libvirt/virtlockd.conf b/libvirt/virtlockd.conf
index 24b69aa4253ce49f3aabd114d41975ecd6eed636..1a2b27d0b9a792e450034cc762d32850c1b7c5bd 100644 (file)
--- a/libvirt/virtlockd.conf
+++ b/libvirt/virtlockd.conf
@@ -52,22 +52,13 @@
 #log_outputs="3:syslog:virtlockd"
 #
 
-# Log debug buffer size:
-#
-# This configuration option is no longer used, since the global
-# log buffer functionality has been removed. Please configure
-# suitable log_outputs/log_filters settings to obtain logs.
-#log_buffer_size = 64
-
 # The maximum number of concurrent client connections to allow
-# over all sockets combined.
+# on primary socket
 # Each running virtual machine will require one open connection
 # to virtlockd. So 'max_clients' will affect how many VMs can
 # be run on a host
 #max_clients = 1024
 
-# Same processing controls, but this time for the admin interface.
-# For description of each option, be so kind to scroll few lines
-# upwards.
-
+# The maximum number of concurrent client connections to allow
+# on administrative socket
 #admin_max_clients = 5

diff --git a/libvirt/virtlogd.conf b/libvirt/virtlogd.conf
index 7ef1ac324f43310ecb27f088b104a6d2c3d43efb..c22b7737effb270446a1b3f66d081526055b1906 100644 (file)
--- a/libvirt/virtlogd.conf
+++ b/libvirt/virtlogd.conf
@@ -55,9 +55,12 @@
 #
 
 # The maximum number of concurrent client connections to allow
-# over all sockets combined.
+# on primary socket
 #max_clients = 1024
 
+# The maximum number of concurrent client connections to allow
+# on administrative socket
+#admin_max_clients = 5
 
 # Maximum file size before rolling over. Defaults to 2 MB
 #max_size = 2097152