Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2014-03-12 15:45:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2014-03-04 13:45:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-03-12 15:45:50.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 4 11:43:25 MST 2014 - jfehlig@suse.com + +- Improve lock manager comments in qemu.conf + Updated suse-qemu-conf.patch + +------------------------------------------------------------------- +Tue Mar 4 17:03:47 UTC 2014 - speilicke@suse.com + +- Create /etc/libvirt/hooks to allow using hook scripts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.h2lJOi/_old 2014-03-12 15:45:51.000000000 +0100 +++ /var/tmp/diff_new_pack.h2lJOi/_new 2014-03-12 15:45:51.000000000 +0100 @@ -494,6 +494,9 @@ Requires: bridge-utils Requires: iproute Requires: logrotate +%if %{with_apparmor} +Requires: apparmor-parser +%endif %if %{with_udev} Requires: udev >= 145 @@ -505,9 +508,6 @@ Recommends: PolicyKit >= 0.6 %endif %endif -%if %{with_cgconfig} -Requires: libcgroup1 -%endif %ifarch i386 i586 i686 x86_64 ia64 # For virConnectGetSysinfo Requires: dmidecode @@ -1194,6 +1194,7 @@ # temporarily remove polkit ACL policiy configuration - bnc#827644 rm -f $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions/org.libvirt.api.policy mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/hooks %find_lang %{name} # Add a README to the libvirt package with a note about the empty # file list @@ -1416,6 +1417,7 @@ %{_sbindir}/virtlockd %dir %{_libdir}/%{name} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/hooks %{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd %{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd %if %{with_systemd} ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.h2lJOi/_old 2014-03-12 15:45:52.000000000 +0100 +++ /var/tmp/diff_new_pack.h2lJOi/_new 2014-03-12 15:45:52.000000000 +0100 @@ -19,19 +19,32 @@ # If set to non-zero, then the default security labeling # will make guests confined. If set to zero, then guests -@@ -402,6 +411,15 @@ +@@ -402,10 +411,25 @@ #allow_disk_format_probing = 1 +-# To enable 'Sanlock' project based locking of the file +-# content (to prevent two VMs writing to the same +-# disk), uncomment this +# SUSE note: -+# Many lock managers, sanlock included, will kill the resources -+# they protect when terminated. E.g. the sanlock daemon will kill -+# any virtual machines for which it holds disk leases when the -+# daemon is stopped or restarted. Administrators must be vigilant -+# when enabling a lock manager since simply updating the manager -+# may cause it to be restarted, potentially killing the resources -+# it protects. ++# Two lock managers are supported: lockd and sanlock. lockd, which ++# is provided by the virtlockd service, uses advisory locks (flock(2)) ++# to protect virtual machine disks. sanlock uses the notion of leases ++# to protect virtual machine disks and is more appropriate in a SAN ++# environment. +# - # To enable 'Sanlock' project based locking of the file - # content (to prevent two VMs writing to the same - # disk), uncomment this ++# For most deployments that require virtual machine disk protection, ++# lockd is recommended since it is easy to configure and the virtlockd ++# service can be restarted without terminating any running virtual ++# machines. sanlock, which may be preferred in some SAN environments, ++# has the disadvantage of not being able to be restarted without ++# first terminating all virtual machines for which it holds leases. ++# ++# To enable lockd or sanlock based protection of virtual machine disk ++# content (to prevent two VMs writing to the same disk), uncomment one ++# of the following + # ++#lock_manager = "lockd" + #lock_manager = "sanlock" + + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org