Hello community, here is the log from the commit of package python-virtinst for openSUSE:Factory checked in at 2012-05-08 12:28:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-virtinst (Old) and /work/SRC/openSUSE:Factory/.python-virtinst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-virtinst", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python-virtinst/python-virtinst.changes 2012-03-16 13:23:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-virtinst.new/python-virtinst.changes 2012-05-08 12:29:01.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 6 11:46:48 UTC 2012 - [email protected] + +- Backport patch from git: + * virt-install: fix cloning of qcow2 disks + +------------------------------------------------------------------- New: ---- virtinst-fix-qcow2-clone.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-virtinst.spec ++++++ --- /var/tmp/diff_new_pack.RrgJJz/_old 2012-05-08 12:29:02.000000000 +0200 +++ /var/tmp/diff_new_pack.RrgJJz/_new 2012-05-08 12:29:02.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # This macro is used for the continuous automated builds. It just @@ -44,15 +45,16 @@ Patch12: virtinst-storage-ocfs2.diff Patch13: virtinst-qed.diff Patch14: virtinst-add-cache-modes.diff +Patch15: virtinst-fix-qcow2-clone.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildArch: noarch Url: http://virt-manager.org -Provides: virt-install Provides: virt-clone +Provides: virt-convert Provides: virt-image +Provides: virt-install Provides: virt-pack -Provides: virt-convert Requires: libvirt-python >= 0.4.5 Requires: libxml2-python Requires: python-urlgrabber @@ -80,6 +82,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build python setup.py build ++++++ virtinst-fix-qcow2-clone.patch ++++++ >From f0195e95d57deda83daed5231582ca86bde519ae Mon Sep 17 00:00:00 2001 From: Cole Robinson <[email protected]> Date: Thu, 1 Mar 2012 17:31:40 -0500 Subject: [PATCH] virt-clone: fix guest booting when cloning a qcow2 image We weren't syncing the driver type value in the XML --- diff --git a/virtinst/CloneManager.py b/virtinst/CloneManager.py index f4af695..aa5e3f5 100644 --- a/virtinst/CloneManager.py +++ b/virtinst/CloneManager.py @@ -473,11 +473,6 @@ class CloneDesign(object): _("Clone onto existing storage volume is not " "supported: '%s'") % clone_disk.path) - # Change the XML - xmldisk.path = None - xmldisk.type = clone_disk.type - xmldisk.path = clone_disk.path - # Sync 'size' between the two if orig_disk.size: clone_disk.size = orig_disk.size @@ -500,6 +495,12 @@ class CloneDesign(object): elif not self.preserve_dest_disks: clone_disk.clone_path = orig_disk.path + # Change the XML + xmldisk.path = None + xmldisk.type = clone_disk.type + xmldisk.path = clone_disk.path + xmldisk.driver_type = clone_disk.driver_type + # Save altered clone xml self._clone_xml = self._guest.get_xml_config() >From c9ae2ac4668213c03614842d92327737a25cf9ec Mon Sep 17 00:00:00 2001 From: Wanlong Gao <[email protected]> Date: Thu, 29 Mar 2012 10:58:15 -0400 Subject: [PATCH] virt-clone: further fix guest booting when cloning a qcow2 image commit f0195e95d5 didn't fix the problem completely, we should get the orig_disk's driver_type when setup cloning. Signed-off-by: Wanlong Gao <gaowanlong cn fujitsu com> --- diff --git a/virtinst/CloneManager.py b/virtinst/CloneManager.py index 88e4209..24bbb50 100644 --- a/virtinst/CloneManager.py +++ b/virtinst/CloneManager.py @@ -499,7 +499,7 @@ class CloneDesign(object): xmldisk.path = None xmldisk.type = clone_disk.type xmldisk.path = clone_disk.path - xmldisk.driver_type = clone_disk.driver_type + xmldisk.driver_type = orig_disk.driver_type # Save altered clone xml self._clone_xml = self._guest.get_xml_config() @@ -551,7 +551,8 @@ class CloneDesign(object): device = VirtualDisk.DEVICE_CDROM d = VirtualDisk(disk.path, conn=self._hyper_conn, - device=device, validate=validate) + device=device, driverType=disk.driver_type, + validate=validate) d.target = disk.target except Exception, e: logging.debug("", exc_info=True) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
