Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
the upload fixes two bugs:
712563 make virt* usable at all with xen
716672 makes sure VMs using the (common) qcow2 image can be clonde
Would be great to have this in the next point release. Debdiff is
attached. O.k.to upload?
Cheers,
-- Guido
-- System Information:
Debian Release: jessie/sid
APT prefers stable
APT policy: (990, 'stable'), (500, 'testing'), (50, 'unstable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.9-1-686-pae (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru virtinst-0.600.1/debian/changelog virtinst-0.600.1/debian/changelog
--- virtinst-0.600.1/debian/changelog 2013-01-15 17:06:42.000000000 +0100
+++ virtinst-0.600.1/debian/changelog 2013-07-15 21:20:49.000000000 +0200
@@ -1,3 +1,14 @@
+virtinst (0.600.1-4) wheezy-proposed-updates; urgency=low
+
+ [ Oliver Seufer ]
+ * [868fe75] Rely on xen finding it's tools (Closes: #712563)
+
+ [ Guido Günther ]
+ * [4a6b19e] virt-clone: Properly set image type.
+ Thanks to Roy Meulekamp for sorting this out (Closes: #716672)
+
+ -- Guido Günther <a...@sigxcpu.org> Mon, 15 Jul 2013 21:20:49 +0200
+
virtinst (0.600.1-3) wheezy-proposed-updates; urgency=low
* [3723835] Don't fail if we can't set locale (debian bug #697864)
diff -Nru virtinst-0.600.1/debian/patches/0001-fix-path-to-hvmloader.patch virtinst-0.600.1/debian/patches/0001-fix-path-to-hvmloader.patch
--- virtinst-0.600.1/debian/patches/0001-fix-path-to-hvmloader.patch 2013-01-15 16:21:07.000000000 +0100
+++ virtinst-0.600.1/debian/patches/0001-fix-path-to-hvmloader.patch 2013-07-15 21:20:33.000000000 +0200
@@ -1,8 +1,8 @@
-From: Guido Guenther <a...@sigxcpu.org>
-Date: Tue, 24 Jun 2008 15:24:21 +0200
+From: Oliver Seufer <deb...@seufer.de>
+Date: Sat, 01 Jun 2013 22:41:07 +0200
Subject: fix path to hvmloader
-Closes: #487682
+Closes: #685749
---
virtinst/Installer.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
@@ -16,7 +16,7 @@
if not loader and self.is_hvm() and hvxen:
- loader = "/usr/lib/xen/boot/hvmloader"
-+ loader = "/usr/lib/xen-default/boot/hvmloader"
++ loader = "hvmloader"
# Use older libvirt 'linux' value for back compat
if os_type == "xen" and hvxen:
diff -Nru virtinst-0.600.1/debian/patches/0002-Fix-path-to-pygrub.patch virtinst-0.600.1/debian/patches/0002-Fix-path-to-pygrub.patch
--- virtinst-0.600.1/debian/patches/0002-Fix-path-to-pygrub.patch 2013-01-15 16:21:07.000000000 +0100
+++ virtinst-0.600.1/debian/patches/0002-Fix-path-to-pygrub.patch 2013-07-15 21:20:33.000000000 +0200
@@ -1,7 +1,8 @@
-From: Marco Sinhoreli <msinh...@gmail.com>
-Date: Thu, 26 Jun 2008 18:07:13 +0200
+From: Oliver Seufer <deb...@seufer.de>
+Date: Sat, 01 Jun 2013 22:41:07 +0200
Subject: Fix path to pygrub
+Closes: #685749
---
virtinst/util.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
@@ -15,12 +16,12 @@
return "/usr/lib/xen/bin/pygrub"
else:
- return "/usr/bin/pygrub"
-+ return "/usr/lib/xen-default/bin/pygrub"
++ return "pygrub"
if platform.system() == "SunOS":
return "/usr/lib/xen/bin/pygrub"
- return "/usr/bin/pygrub"
-+ return "/usr/lib/xen-default/bin/pygrub"
++ return "pygrub"
def uri_split(uri):
"""
diff -Nru virtinst-0.600.1/debian/patches/0006-virt-clone-Properly-set-image-type.patch virtinst-0.600.1/debian/patches/0006-virt-clone-Properly-set-image-type.patch
--- virtinst-0.600.1/debian/patches/0006-virt-clone-Properly-set-image-type.patch 1970-01-01 01:00:00.000000000 +0100
+++ virtinst-0.600.1/debian/patches/0006-virt-clone-Properly-set-image-type.patch 2013-07-15 21:14:15.000000000 +0200
@@ -0,0 +1,51 @@
+From: Roy Meulekamp <debian.b...@slimdesign.nl>
+Date: Mon, 15 Jul 2013 21:12:32 +0200
+Subject: virt-clone: Properly set image type
+
+Patch adapted from
+
+https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=f0195e95d57deda83daed5231582ca86bde519ae
+https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=8447cee94b36da389a73d3d81ecbbbe543ac5d8a
+---
+ virtinst/CloneManager.py | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/virtinst/CloneManager.py b/virtinst/CloneManager.py
+index c3ecdc2..e4c2efa 100644
+--- a/virtinst/CloneManager.py
++++ b/virtinst/CloneManager.py
+@@ -477,11 +477,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
+@@ -504,6 +499,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 = orig_disk.driver_type
++
+ # Save altered clone xml
+ self._clone_xml = self._guest.get_xml_config()
+
+@@ -556,7 +557,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)
diff -Nru virtinst-0.600.1/debian/patches/series virtinst-0.600.1/debian/patches/series
--- virtinst-0.600.1/debian/patches/series 2013-01-15 16:20:37.000000000 +0100
+++ virtinst-0.600.1/debian/patches/series 2013-07-15 21:14:15.000000000 +0200
@@ -3,3 +3,4 @@
0003-Fix-path-to-keyboard-configuration.patch
0004-Fix-location-of-Debian-daily-builds.patch
0005-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch
+0006-virt-clone-Properly-set-image-type.patch
