--- virtinst-0.500.0.orig/debian/copyright +++ virtinst-0.500.0/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Guido Guenther on +Fri, 23 Nov 2007 00:30:45 +0100. + +It was downloaded from http://virt-manager.et.redhat.com/download.html + +Upstream Authors: + + Jeremy Katz + Daniel Berrange + Hugh Brock + +Copyright: + + Copyright 2005-2008 Redhat Inc + +License: + + You are free to distribute this software under the terms of the GNU General + Public License Version 2. The full text of this license can be found in the + file /usr/share/common-licenses/GPL-2 + +The Debian packaging is (C) 2007, Guido Guenther and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- virtinst-0.500.0.orig/debian/examples +++ virtinst-0.500.0/debian/examples @@ -0,0 +1 @@ +doc/* --- virtinst-0.500.0.orig/debian/control +++ virtinst-0.500.0/debian/control @@ -0,0 +1,24 @@ +Source: virtinst +Section: admin +Priority: extra +Maintainer: Debian Libvirt Maintainers +Uploaders: Guido Günther +Build-Depends: cdbs, debhelper (>= 7), python-support, python-all-dev, quilt, python-libxml2, python-urlgrabber, python-libvirt +Homepage: http://virt-manager.et.redhat.com/ +Vcs-Git: git://git.debian.org/git/pkg-libvirt/virtinst.git +Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/virtinst.git +Standards-Version: 3.8.3 + +Package: virtinst +Architecture: all +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-libvirt (>= 0.4.6), + python-libxml2, python-urlgrabber +Recommends: virt-viewer, qemu +Description: Programs to create and clone virtual machines + Virtinst is a set of commandline tools to create virtual machines using + libvirt: + . + virt-install: provision new virtual machines + virt-clone: clone existing virtual machines + virt-image: create virtual machines from an image description + virt-convert: convert virtual machines between formats --- virtinst-0.500.0.orig/debian/changelog +++ virtinst-0.500.0/debian/changelog @@ -0,0 +1,278 @@ +virtinst (0.500.0-3) unstable; urgency=low + + * [7b2d9d5] Add error handling to VirtualDisk._clone_local (Closes: #555748) + + -- Guido Günther Sat, 21 Nov 2009 14:35:41 +0100 + +virtinst (0.500.0-2) unstable; urgency=low + + [ Laurent Léonard ] + * [2060102] Bump Debhelper version to 7. + * [effbb27] Bump Standards-Version to 3.8.3. + * [babcc4b] Clean debian/rules. + * [6bb175f] Remove debian/pycompat. According to python-support + recommendations. Also remove it in debian/rules clean target (see + #424898). + + [ Guido Günther ] + * [ff8cee7] Don't use virtio for cdrom/floppy devices Patch pulled + from upstream HG. (Closes: #553171) - thanks to Harald Dunkel + + -- Guido Günther Wed, 04 Nov 2009 11:29:42 +0100 + +virtinst (0.500.0-1) unstable; urgency=low + + * [75709b9] bump standards version + * [d275b5a] Imported Upstream version 0.500.0 + * [be8497e] drop patches applied upstream: + 0003-allow-to-pass-nic-model.patch + 0004-parse-etc-default-console-setup-for-keymap-informati.patch + 0005-use-QEMU-s-USB-Tablet-with-Squeeze-guests.patch + 0006-add-Ubuntu-Karmic-to-osdict.patch + 0007-fix-bridge-names-not-ending-with-digit.patch + 0008-Turn-on-ACPI-APIC-for-Windows-except-for-Xen-3.1.0.patch + 0009-Add-Windows-7-to-the-osdict.patch + + -- Guido Günther Wed, 29 Jul 2009 17:10:48 +0200 + +virtinst (0.400.3-5) unstable; urgency=low + + [ Guido Günther ] + * [d1f073b] add Ubuntu Karmic to osdict (Closes: #532531) - thanks to + Christophe Sauthier + * [a008f8b] fix bridge names not ending with digit. Pulled from upstream. + (Closes: #533539) - thanks to Cole Robinso for the fix and Andreas + Unterkircher for testing + + [ Laurent Léonard ] + * [16b8a6c] Turn on ACPI/APIC for Windows, except for Xen < 3.1.0. + Pulled from upstream. (Closes: #533201) - thanks to Cole Robinson + * [3840c11] Add Windows 7 to the osdict. (Closes: #535781) + + -- Guido Günther Fri, 17 Jul 2009 10:24:16 +0200 + +virtinst (0.400.3-4) unstable; urgency=low + + * [b882065] use QEMU's USB Tablet with Squeeze guests evdev picks this + up as mouse which gives more exact mouse handling without the need + to grab/ungrab the mouse anymore. + * [da4d0c2] bump standards version + + -- Guido Günther Fri, 29 May 2009 16:02:32 +0200 + +virtinst (0.400.3-3) unstable; urgency=low + + * [a548e37] Update patches: + * drop 0001-Don-t-require-256MB-on-Debian-installations.patch, + Upstream changed that to 64MB + * new patch 0003-allow-to-pass-nic-model.patch: allow to pass the nic + model on the command line + * new patch 0004-parse-etc-default-console-setup- + for-keymap-informat.patch parses /etc/default/console-setup for + keymap data (Closes: #528454) + + -- Guido Günther Sun, 17 May 2009 13:51:57 +0200 + +virtinst (0.400.3-2) unstable; urgency=low + + * [88581dc] remove redo-patches target handled via external script + * [584686d] os_variant is no more (Closes: #521089) + + -- Guido Günther Wed, 25 Mar 2009 15:53:51 +0100 + +virtinst (0.400.3-1) unstable; urgency=low + + * [6792db8] Imported Upstream version 0.400.3 + * [3c4c7be] drop 0004-manpage-typo.patch - applied upstream + * [f95ac5c] rediff remaining patches against new upstream version + + -- Guido Günther Sun, 22 Mar 2009 20:13:27 +0100 + +virtinst (0.400.1-2) unstable; urgency=low + + * upload to unstable + * [4f2f394] s/bux/bus/ manpage type + + -- Guido Günther Sun, 15 Feb 2009 20:14:53 +0100 + +virtinst (0.400.1-1) experimental; urgency=low + + * [d46750d] Imported Upstream version 0.400.1 (Closes: #513288) + * [d18654d] drop patches + * fixed upstream: + 0004-virt-convert-Fix-crash-caused-by-accessing-now-priv.patch + 0005-Explicitly-set-FullVirtGuest-arch-to-equal-host-arch.patch + * applied upstream: + 0006-scratchdir-for-uid-0.patch + 0007-create-scratchdir-if-it-doesn-t-exist.patch + 0008-use-virtio-for-Lenny-guests.patch + 0009-Add-support-for-Debian-Xen-paravirt-installs.patch + 0010-look-for-keymap-in-xorg.conf-too.patch + * [dc1ae07] rebase debian specific patches + + -- Guido Günther Thu, 29 Jan 2009 16:45:08 +0100 + +virtinst (0.400.0-7) unstable; urgency=low + + * [4b7369d] fix Vcs- URLs - thanks to Ian Campbell + * [4b691af] Look for the current keymap in xorg.conf + + -- Guido Günther Mon, 01 Dec 2008 19:28:43 +0100 + +virtinst (0.400.0-6) unstable; urgency=low + + * upload to unstable + * [bf4db09] add a versioned dependency + + -- Guido Günther Wed, 19 Nov 2008 09:19:29 +0100 + +virtinst (0.400.0-5) experimental; urgency=low + + * [c6eb3fa] fix maintainer + * [b63225f] add support for xen paravirt installs + + -- Guido Günther Thu, 30 Oct 2008 15:52:13 +0100 + +virtinst (0.400.0-4) experimental; urgency=low + + * [58763f3] fix indentaion for 0006-scratchdir-for-uid-0.patch + * [98fedd9] mention virt-convert + + -- Guido Günther Wed, 22 Oct 2008 10:20:27 +0200 + +virtinst (0.400.0-3) experimental; urgency=low + + * [a2d6dd4] virt-convert uses qemu-img so recommend qemu + * [e765545] use virtio for Lenny Guests (0008-use-virtio-for-Lenny- + guests.patch) + + -- Guido Guenther Fri, 26 Sep 2008 09:30:26 +0200 + +virtinst (0.400.0-2) experimental; urgency=low + + * [b2c62d9] new patches 0006-scratchdir-for-uid-0.patch + 0007-create-scratchdir-if-it-doesn-t-exist.patch + fix scratchdir handling for the ImageFetcher + + -- Guido Guenther Mon, 22 Sep 2008 12:53:48 +0200 + +virtinst (0.400.0-1) experimental; urgency=low + + * [4b12aad] Imported Upstream version 0.400.0 (Closes: #495013) + * [62796af] drop 0001-forward-to-hg-as-of-6462dfd3e606.patch + * [70b73a8] drop 0005-fix-mac-address-on-virt-clone.patch - applied + upstream + * [ea789ac] drop 0006-catch-ParserExceptions.patch - applied upstream + * [7526107] adjust other patches to new upstream version + * [a80781e] new patch 0004-virt-convert-Fix-crash-caused-by-....patch + from upstream HG + * [090250c] new patch 0005-Explicitly-set-FullVirtGuest-arch-....patch + from upstream HG + * [cef6ddb] adjust copyright + + -- Guido Guenther Thu, 18 Sep 2008 15:06:19 +0200 + +virtinst (0.300.3-5) unstable; urgency=low + + * [14c4b3c] catch ParserExceptions (Closes: #493758) + * [e0629a2] fix mac address on virt-clone (adressess parts of #495013) + * [af27170] Don't require thre arguments to get_memory() (Closes: + #493782) + * [0b43823] improve package description + * [039bf5c] bump standars version + * [8c91abf] add README.source + + -- Guido Guenther Fri, 15 Aug 2008 14:52:27 +0200 + +virtinst (0.300.3-4) unstable; urgency=low + + [ Marco Sinhoreli ] + * [39c7244] Fix path to pygrub + + -- Guido Guenther Thu, 26 Jun 2008 18:10:26 +0200 + +virtinst (0.300.3-3) unstable; urgency=low + + * [c82fe9f] fix path to hvmloader (Closes: #487682) + + -- Guido Guenther Tue, 24 Jun 2008 16:09:16 +0200 + +virtinst (0.300.3-2) unstable; urgency=low + + * forward to hg as of 6462dfd3e606 - fixes kvm virtual machine creation with + virt-manager + + -- Guido Guenther Mon, 14 Apr 2008 17:44:53 +0200 + +virtinst (0.300.3-1) experimental; urgency=low + + * upload to experimental + * new upstream version + * drop non-root.diff - applied upstream + * drop debian.diff - applied upstream + + -- Guido Guenther Fri, 14 Mar 2008 20:09:19 +0100 + +virtinst (0.300.2-3) unstable; urgency=low + + * non-root.diff: don't fail installations as non-root user + + -- Guido Guenther Sun, 03 Feb 2008 16:51:14 +0100 + +virtinst (0.300.2-2) unstable; urgency=low + + * build-depend on the python packages for the testsuite (Closes: #462514) + + -- Guido Guenther Fri, 25 Jan 2008 14:29:30 +0100 + +virtinst (0.300.2-1) unstable; urgency=low + + * New Upstream Version + * drop patches applied/fixed upstream: + * recommend-virt-viewer.diff + * virt-clone_sparse.diff + * man-virt-clone.diff + * keep documentation part of debian.diff + + -- Guido Guenther Wed, 16 Jan 2008 10:47:26 +0100 + +virtinst (0.300.1-5) unstable; urgency=low + + * recommend virt-viewer instead of presenting the user with a python + exception + + -- Guido Guenther Tue, 18 Dec 2007 09:56:08 +0100 + +virtinst (0.300.1-4) unstable; urgency=low + + * document debian os-variants (Closes: #455861) - Thanks to Trent W. + Buck for the patch + * Don't require 256MB on Debian installations (Closes: #455860) + * fix typo in homepage field + * bump standards version + * install examples + + -- Guido Guenther Sat, 15 Dec 2007 18:56:08 +0100 + +virtinst (0.300.1-3) unstable; urgency=low + + * debian.diff: add Debian as supported fully virtualized guest + * recommend virt-viewer, needed for vnc console access + * remove superflous debian/dirs + + -- Guido Guenther Tue, 11 Dec 2007 12:13:32 +0100 + +virtinst (0.300.1-2) unstable; urgency=low + + * virt-clone_sparse.diff: don't fail on sparse files + * add watchfile + * move to team maintenance + + -- Guido Guenther Tue, 11 Dec 2007 11:27:34 +0100 + +virtinst (0.300.1-1) experimental; urgency=low + + * Initial release (Closes: #452513) + + -- Guido Guenther Fri, 23 Nov 2007 00:30:45 +0100 + --- virtinst-0.500.0.orig/debian/watch +++ virtinst-0.500.0/debian/watch @@ -0,0 +1,3 @@ +# format version number, currently 3; this line is compulsory! +version=3 +http://virt-manager.et.redhat.com/download/sources/virtinst/virtinst-([\d\.]*)\.tar\.gz --- virtinst-0.500.0.orig/debian/compat +++ virtinst-0.500.0/debian/compat @@ -0,0 +1 @@ +7 --- virtinst-0.500.0.orig/debian/pyversions +++ virtinst-0.500.0/debian/pyversions @@ -0,0 +1 @@ +2.4- --- virtinst-0.500.0.orig/debian/rules +++ virtinst-0.500.0/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM = pysupport + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +clean:: + rm -rf $(CURDIR)/build + rm -f $(CURDIR)/debian/pycompat --- virtinst-0.500.0.orig/debian/README.source +++ virtinst-0.500.0/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- virtinst-0.500.0.orig/debian/patches/0003-Don-t-use-virtio-for-cdrom-floppy-devices.patch +++ virtinst-0.500.0/debian/patches/0003-Don-t-use-virtio-for-cdrom-floppy-devices.patch @@ -0,0 +1,92 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Wed, 4 Nov 2009 10:34:21 +0100 +Subject: [PATCH] Don't use virtio for cdrom/floppy devices + +Patch pulled from upstream HG. + +Closes: #553171 +Thanks: Harald Dunkel +--- + tests/xmlconfig-xml/install-f11.xml | 9 +++++++++ + tests/xmlconfig.py | 10 ++++++++-- + virtinst/FullVirtGuest.py | 4 +++- + 3 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/tests/xmlconfig-xml/install-f11.xml b/tests/xmlconfig-xml/install-f11.xml +index 9ec5fdd..21354e5 100644 +--- a/tests/xmlconfig-xml/install-f11.xml ++++ b/tests/xmlconfig-xml/install-f11.xml +@@ -17,6 +17,10 @@ + 5 + + /usr/lib/xen/bin/qemu-dm ++ ++ ++ ++ + + + +@@ -25,6 +29,11 @@ + + + ++ ++ ++ ++ ++ + + + +diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py +index a2a05e0..a6570b1 100644 +--- a/tests/xmlconfig.py ++++ b/tests/xmlconfig.py +@@ -58,6 +58,9 @@ def get_basic_fullyvirt_guest(typ="xen"): + g.vcpus = 5 + return g + ++def get_floppy(path="/default-pool/testvol1.img"): ++ return VirtualDisk(path, conn=conn, device=VirtualDisk.DEVICE_FLOPPY) ++ + def get_filedisk(path="/tmp/test.img"): + return VirtualDisk(path, size=.0001, conn=conn) + +@@ -327,8 +330,11 @@ class TestXMLConfig(unittest.TestCase): + g = get_basic_fullyvirt_guest("kvm") + g.os_type = "linux" + g.os_variant = "fedora11" +- g.installer = virtinst.PXEInstaller(type="kvm", os_type="hvm", +- conn=g.conn) ++ g.installer = virtinst.DistroInstaller(type="kvm", os_type="hvm", ++ conn=g.conn, ++ location="/default-pool/default-vol") ++ g.installer.cdrom = True ++ g.disks.append(get_floppy()) + g.disks.append(get_filedisk()) + g.disks.append(get_blkdisk()) + g.nics.append(get_virtual_network()) +diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py +index 556708e..4cfe40e 100644 +--- a/virtinst/FullVirtGuest.py ++++ b/virtinst/FullVirtGuest.py +@@ -24,6 +24,7 @@ import DistroInstaller + + from Guest import Guest + from VirtualDevice import VirtualDevice ++from VirtualDisk import VirtualDisk + from VirtualInputDevice import VirtualInputDevice + from VirtualCharDevice import VirtualCharDevice + +@@ -122,7 +123,8 @@ class FullVirtGuest(Guest): + if net_model and not net.model: + net.model = net_model + for disk in self._get_install_devs(VirtualDevice.VIRTUAL_DEV_DISK): +- if disk_bus and not disk.bus: ++ if (disk_bus and not disk.bus and ++ disk.device == VirtualDisk.DEVICE_DISK): + disk.bus = disk_bus + + # If no serial devices were attached to the guest, stick the default +-- --- virtinst-0.500.0.orig/debian/patches/0002-Fix-path-to-pygrub.patch +++ virtinst-0.500.0/debian/patches/0002-Fix-path-to-pygrub.patch @@ -0,0 +1,27 @@ +From: Marco Sinhoreli +Date: Thu, 26 Jun 2008 18:07:13 +0200 +Subject: [PATCH] Fix path to pygrub + +--- + virtinst/util.py | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/virtinst/util.py b/virtinst/util.py +index 808200f..08cf38f 100644 +--- a/virtinst/util.py ++++ b/virtinst/util.py +@@ -401,11 +401,11 @@ def pygrub_path(conn=None): + if (cap.host.arch == "i86pc"): + return "/usr/lib/xen/bin/pygrub" + else: +- return "/usr/bin/pygrub" ++ return "/usr/lib/xen-default/bin/pygrub" + + if platform.system() == "SunOS": + return "/usr/lib/xen/bin/pygrub" +- return "/usr/bin/pygrub" ++ return "/usr/lib/xen-default/bin/pygrub" + + def uri_split(uri): + """ +-- --- virtinst-0.500.0.orig/debian/patches/0004-Add-error-handling-to-VirtualDisk._clone_local.patch +++ virtinst-0.500.0/debian/patches/0004-Add-error-handling-to-VirtualDisk._clone_local.patch @@ -0,0 +1,69 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Sat, 21 Nov 2009 14:06:41 +0100 +Subject: [PATCH] Add error handling to VirtualDisk._clone_local + +Closes: #555748 +--- + virtinst/VirtualDisk.py | 46 +++++++++++++++++++++++++--------------------- + 1 files changed, 25 insertions(+), 21 deletions(-) + +diff --git a/virtinst/VirtualDisk.py b/virtinst/VirtualDisk.py +index 67e2d03..781b11e 100644 +--- a/virtinst/VirtualDisk.py ++++ b/virtinst/VirtualDisk.py +@@ -859,29 +859,33 @@ class VirtualDisk(VirtualDevice): + + zeros = '\0' * 4096 + ++ src_fd, dst_fd = None, None + try: +- src_fd = os.open(self.clone_path, os.O_RDONLY) +- dst_fd = os.open(self.path, os.O_WRONLY | os.O_CREAT) +- +- i=0 +- while 1: +- l = os.read(src_fd, clone_block_size) +- s = len(l) +- if s == 0: +- meter.end(size_bytes) +- break +- # check sequence of zeros +- if sparse and zeros == l: +- os.lseek(dst_fd, s, 1) +- else: +- b = os.write(dst_fd, l) +- if s != b: +- meter.end(i) ++ try: ++ src_fd = os.open(self.clone_path, os.O_RDONLY) ++ dst_fd = os.open(self.path, os.O_WRONLY | os.O_CREAT) ++ ++ i=0 ++ while 1: ++ l = os.read(src_fd, clone_block_size) ++ s = len(l) ++ if s == 0: ++ meter.end(size_bytes) + break +- i += s +- if i < size_bytes: +- meter.update(i) +- ++ # check sequence of zeros ++ if sparse and zeros == l: ++ os.lseek(dst_fd, s, 1) ++ else: ++ b = os.write(dst_fd, l) ++ if s != b: ++ meter.end(i) ++ break ++ i += s ++ if i < size_bytes: ++ meter.update(i) ++ except OSError, e: ++ raise RuntimeError(_("Error cloning diskimage %s to %s: %s") % ++ (self.clone_path, self.path, str(e))) + finally: + if src_fd is not None: + os.close(src_fd) +-- --- virtinst-0.500.0.orig/debian/patches/series +++ virtinst-0.500.0/debian/patches/series @@ -0,0 +1,4 @@ +0001-fix-path-to-hvmloader.patch +0002-Fix-path-to-pygrub.patch +0003-Don-t-use-virtio-for-cdrom-floppy-devices.patch +0004-Add-error-handling-to-VirtualDisk._clone_local.patch --- virtinst-0.500.0.orig/debian/patches/0001-fix-path-to-hvmloader.patch +++ virtinst-0.500.0/debian/patches/0001-fix-path-to-hvmloader.patch @@ -0,0 +1,23 @@ +From: Guido Guenther +Date: Tue, 24 Jun 2008 15:24:21 +0200 +Subject: [PATCH] fix path to hvmloader + +Closes: #487682 +--- + virtinst/FullVirtGuest.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py +index d88d0dd..556708e 100644 +--- a/virtinst/FullVirtGuest.py ++++ b/virtinst/FullVirtGuest.py +@@ -65,7 +65,7 @@ class FullVirtGuest(Guest): + self.emulator = "/usr/lib/xen/bin/qemu-dm" + + if (not self.loader) and self.type == "xen": +- self.loader = "/usr/lib/xen/boot/hvmloader" ++ self.loader = "/usr/lib/xen-default/boot/hvmloader" + + + def os_features(self): +--