From cb724f8d13680e9902619ea49d4c3a0df0fc5e5d Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 25 May 2012 11:18:24 +0100 Subject: [PATCH] Fix mistakes in augeas lens Add nmissing 'host_uuid' entry to libvirtd.conf lens and rename spice_passwd to spice_password in qemu.conf lens Signed-off-by: Daniel P. Berrange (cherry picked from commit a9c779caf3b9295ed0cf549d0f36214d7d8fabf7) --- daemon/libvirtd.aug | 4 ++++ src/qemu/libvirtd_qemu.aug | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index 9d78bd7fe1..f32b3a1397 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -62,6 +62,7 @@ module Libvirtd = let logging_entry = int_entry "log_level" | str_entry "log_filters" | str_entry "log_outputs" + | int_entry "log_buffer_size" let auditing_entry = int_entry "audit_level" | bool_entry "audit_logging" @@ -70,6 +71,8 @@ module Libvirtd = | int_entry "keepalive_count" | bool_entry "keepalive_required" + let misc_entry = str_entry "host_uuid" + (* Each enty in the config is one of the following three ... *) let entry = network_entry | sock_acl_entry @@ -80,6 +83,7 @@ module Libvirtd = | logging_entry | auditing_entry | keepalive_entry + | misc_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 9120d4e8a7..359f8f1009 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -35,7 +35,7 @@ module Libvirtd_qemu = | str_entry "spice_listen" | bool_entry "spice_tls" | str_entry "spice_tls_x509_cert_dir" - | str_entry "spice_passwd" + | str_entry "spice_password" | str_entry "security_driver" | bool_entry "security_default_confined" | bool_entry "security_require_confined"