From 4d81ed52eae07ee0fcb4ff81ef62137b971ee041d35dc7bdcdd050ae2b587c6d Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 4 Mar 2014 18:53:29 +0000 Subject: [PATCH 1/3] Accepting request 224655 from home:saschpe:branches:Virtualization - Create /etc/libvirt/hooks to allow using hook scripts OBS-URL: https://build.opensuse.org/request/show/224655 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=356 --- libvirt.changes | 5 +++++ libvirt.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libvirt.changes b/libvirt.changes index 39309a1..142c865 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 4 17:03:47 UTC 2014 - speilicke@suse.com + +- Create /etc/libvirt/hooks to allow using hook scripts + ------------------------------------------------------------------- Sun Mar 2 20:32:21 MST 2014 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 853191e..b8bd84e 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1194,6 +1194,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/vi_VN # 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 @@ fi %{_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} From e3d360d0d47569c1470883be52b9264a914b6b6bd5249a7cca7b42fbf0a8fb62 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 4 Mar 2014 19:05:01 +0000 Subject: [PATCH 2/3] - Improve lock manager comments in qemu.conf Updated suse-qemu-conf.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=357 --- libvirt.changes | 6 ++++++ suse-qemu-conf.patch | 35 ++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libvirt.changes b/libvirt.changes index 142c865..c93f200 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 57b63ce..095e46c 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -19,19 +19,32 @@ Index: libvirt-1.2.2/src/qemu/qemu.conf # 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" + + From d4706a0ef589b0241deb709d560feaf7660d1f91b87da0fc6661d3986154319a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 12 Mar 2014 11:12:54 +0000 Subject: [PATCH 3/3] Accepting request 225657 from home:cbosdonnat:branches:Virtualization Fixed spec file: * Added missing apparmor-parser requires * Removed explicit libcgroup1 requires OBS-URL: https://build.opensuse.org/request/show/225657 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=358 --- libvirt.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index b8bd84e..b5db7c3 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -494,6 +494,9 @@ Requires: modutils 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: polkit >= 0.93 Recommends: PolicyKit >= 0.6 %endif %endif -%if %{with_cgconfig} -Requires: libcgroup1 -%endif %ifarch i386 i586 i686 x86_64 ia64 # For virConnectGetSysinfo Requires: dmidecode