Push unapplied fixups for previous patch

- Add augeas tests
- Clarify vnc_auto_unix_socket precedence in qemu.conf

diff --git a/daemon/test_libvirtd.aug b/daemon/test_libvirtd.aug
index 5f8b6446760af456c9494affdd53cf1c026a3c17..31fa643c35a44666544146938247b50955d942e0 100644 (file)
--- a/daemon/test_libvirtd.aug
+++ b/daemon/test_libvirtd.aug
@@ -271,6 +271,9 @@ log_filters=\"a\"
 
 # Auditing:
 audit_level = 2
+
+# VNC socket
+vnc_auto_unix_socket = 1
 "
 
    test Libvirtd.lns get conf =
@@ -549,3 +552,6 @@ audit_level = 2
        { "#empty" }
         { "#comment" = "Auditing:" }
         { "audit_level" = "2" }
+        { "#empty" }
+        { "#comment" = "VNC socket:" }
+        { "vnc_auto_unix_socket" = "1" }

diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index ae6136f57736baf36e23aa63c693a1f81e2796ad..66310d4751a322bf30d5ffdfbc35e199d645b99d 100644 (file)
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -16,7 +16,8 @@
 # host machine, though most VNC clients do not support it.
 #
 # This will only be enabled for VNC configurations that do not have
-# a hardcoded 'listen' or 'socket' value.
+# a hardcoded 'listen' or 'socket' value. This setting takes preference
+# over vnc_listen.
 #
 # vnc_auto_unix_socket = 1