diff -Nru virtinst-0.600.1/debian/changelog virtinst-0.600.1/debian/changelog --- virtinst-0.600.1/debian/changelog 2012-05-25 13:56:06.000000000 +0000 +++ virtinst-0.600.1/debian/changelog 2012-07-27 15:13:59.000000000 +0000 @@ -1,3 +1,10 @@ +virtinst (0.600.1-1ubuntu3.2) precise-proposed; urgency=low + + * debian/patches/9006-fix-disk-cloning.patch: Also clone disk type when + cloning a VM. (LP: #953922) + + -- Marc Deslauriers Fri, 27 Jul 2012 11:13:04 -0400 + virtinst (0.600.1-1ubuntu3.1) precise-proposed; urgency=low * debian/patches/9005_ubuntu_precise.patch: Updated to properly tag LTS diff -Nru virtinst-0.600.1/debian/patches/9006-fix-disk-cloning.patch virtinst-0.600.1/debian/patches/9006-fix-disk-cloning.patch --- virtinst-0.600.1/debian/patches/9006-fix-disk-cloning.patch 1970-01-01 00:00:00.000000000 +0000 +++ virtinst-0.600.1/debian/patches/9006-fix-disk-cloning.patch 2012-07-27 15:14:55.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Also clone disk type when cloning a VM. +Origin: upstream, http://git.fedorahosted.org/git/?p=python-virtinst.git;a=commit;h=f0195e95d57deda83daed5231582ca86bde519ae +Origin: upstream, http://git.fedorahosted.org/git/?p=python-virtinst.git;a=commit;h=c9ae2ac4668213c03614842d92327737a25cf9ec +Bug: https://bugzilla.redhat.com/show_bug.cgi?id=795400 +Bug: https://bugzilla.redhat.com/show_bug.cgi?id=803087 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/virtinst/+bug/953922 + +Index: virtinst-0.600.1/virtinst/CloneManager.py +=================================================================== +--- virtinst-0.600.1.orig/virtinst/CloneManager.py 2012-01-31 17:28:01.000000000 -0500 ++++ virtinst-0.600.1/virtinst/CloneManager.py 2012-07-27 11:12:56.307898290 -0400 +@@ -477,11 +477,6 @@ + _("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 +@@ -504,6 +499,12 @@ + 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 = orig_disk.driver_type ++ + # Save altered clone xml + self._clone_xml = self._guest.get_xml_config() + +@@ -556,7 +557,8 @@ + 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) diff -Nru virtinst-0.600.1/debian/patches/series virtinst-0.600.1/debian/patches/series --- virtinst-0.600.1/debian/patches/series 2012-04-03 16:48:58.000000000 +0000 +++ virtinst-0.600.1/debian/patches/series 2012-07-27 15:12:33.000000000 +0000 @@ -5,3 +5,4 @@ 9004_ubuntu_fix_tree_support.patch 9005_ubuntu_precise.patch 0004-Fix-path-to-qemu-dm.patch +9006-fix-disk-cloning.patch