From ca5a13e226b39def72fb8b5a2a3d6280fcf4b91e Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Dec 02 2008 15:55:03 +0000 Subject: Fix printing translated help messages Allow using virtio to pxe boot --- diff --git a/python-virtinst.spec b/python-virtinst.spec index 8ae729f..d522981 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -11,7 +11,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.0 -Release: 4%{_extra_release} +Release: 5%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-qemu-conn-check.patch Patch2: %{appname}-%{version}-virt-convert-dict.patch @@ -23,6 +23,8 @@ Patch7: %{appname}-%{version}-missing-variable.patch Patch8: %{appname}-%{version}-disk-pool-fixes.patch Patch9: %{appname}-%{version}-win64-entry.patch Patch10: %{appname}-%{version}-update-translations.patch +Patch11: %{appname}-%{version}-undo-pxe-virtio.patch +Patch12: %{appname}-%{version}-fix-translated-help.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,6 +63,8 @@ and install new VMs) and virt-clone (clone an existing virtual machine). %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build python setup.py build @@ -95,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-convert %changelog +* Tue Dec 2 2008 Cole Robinson - 0.400.0-5.fc10 +- Fix printing translated help messages +- Allow using virtio to pxe boot + * Mon Oct 27 2008 Cole Robinson - 0.400.0-4.fc10 - Updated translations (bz 467810) - Specific os entry for XP 64 (bz 467851) diff --git a/virtinst-0.400.0-fix-translated-help.patch b/virtinst-0.400.0-fix-translated-help.patch new file mode 100644 index 0000000..d1652ec --- /dev/null +++ b/virtinst-0.400.0-fix-translated-help.patch @@ -0,0 +1,44 @@ +diff -rup virtinst-0.400.0/virt-clone new/virt-clone +--- virtinst-0.400.0/virt-clone 2008-09-10 15:35:26.000000000 -0400 ++++ new/virt-clone 2008-11-25 12:14:32.120055000 -0500 +@@ -34,7 +34,6 @@ import locale + import virtinst.cli as cli + from virtinst.cli import fail + +-from virtinst import _virtinst as _ + locale.setlocale(locale.LC_ALL, '') + gettext.bindtextdomain(virtinst.gettext_app, virtinst.gettext_dir) + gettext.install(virtinst.gettext_app, virtinst.gettext_dir, unicode=1) +diff -rup virtinst-0.400.0/virt-image new/virt-image +--- virtinst-0.400.0/virt-image 2008-09-10 15:35:26.000000000 -0400 ++++ new/virt-image 2008-11-25 12:14:20.822959000 -0500 +@@ -36,7 +36,6 @@ from virtinst.cli import fail + import gettext + import locale + +-from virtinst import _virtinst as _ + locale.setlocale(locale.LC_ALL, '') + gettext.bindtextdomain(virtinst.gettext_app, virtinst.gettext_dir) + gettext.install(virtinst.gettext_app, virtinst.gettext_dir, unicode=1) +diff -rup virtinst-0.400.0/virt-install new/virt-install +--- virtinst-0.400.0/virt-install 2008-09-10 15:35:26.000000000 -0400 ++++ new/virt-install 2008-11-25 12:26:26.453287000 -0500 +@@ -39,7 +39,6 @@ from virtinst.cli import fail + import gettext + import locale + +-from virtinst import _virtinst as _ + locale.setlocale(locale.LC_ALL, '') + gettext.bindtextdomain(virtinst.gettext_app, virtinst.gettext_dir) + gettext.install(virtinst.gettext_app, virtinst.gettext_dir, unicode=1) +diff -rup virtinst-0.400.0/virt-pack new/virt-pack +--- virtinst-0.400.0/virt-pack 2008-09-10 15:35:26.000000000 -0400 ++++ new/virt-pack 2008-11-25 12:14:55.294169000 -0500 +@@ -40,7 +40,6 @@ import tempfile + import gettext + import locale + +-from virtinst import _virtinst as _ + locale.setlocale(locale.LC_ALL, '') + gettext.bindtextdomain(virtinst.gettext_app, virtinst.gettext_dir) + gettext.install(virtinst.gettext_app, virtinst.gettext_dir, unicode=1) diff --git a/virtinst-0.400.0-undo-pxe-virtio.patch b/virtinst-0.400.0-undo-pxe-virtio.patch new file mode 100644 index 0000000..0143f02 --- /dev/null +++ b/virtinst-0.400.0-undo-pxe-virtio.patch @@ -0,0 +1,38 @@ +# HG changeset patch +# User "Cole Robinson " +# Date 1226346838 18000 +# Node ID 3a9b23c6cd62cea84bae6fa095dcdb9490c4bc1c +# Parent 38298b55baad22a2472bc5e72530706bd388fd4f +Don't skip pxe if virtio nic specified (works for F10 at least). (Alan Pevec) + +diff -r 38298b55baad -r 3a9b23c6cd62 AUTHORS +--- a/AUTHORS Mon Nov 10 14:50:13 2008 -0500 ++++ b/AUTHORS Mon Nov 10 14:53:58 2008 -0500 +@@ -32,6 +32,7 @@ + Guido Guenther + Francois Kooman + Tom Hughes ++ Alan Pevec + + ...send patches and get your name here... + +diff -r 38298b55baad -r 3a9b23c6cd62 virtinst/FullVirtGuest.py +--- a/virtinst/FullVirtGuest.py Mon Nov 10 14:50:13 2008 -0500 ++++ b/virtinst/FullVirtGuest.py Mon Nov 10 14:53:58 2008 -0500 +@@ -406,16 +406,10 @@ + + disk_bus = self._lookup_device_param("disk", "bus") + net_model = self._lookup_device_param("net", "model") +- pxe_skipped = False + + # Only overwrite params if they weren't already specified + for net in self._install_nics: + if net_model and not net.model: +- if net_model == "virtio": +- # virtio net doesn't seem to support pxe, skip first interface +- if not pxe_skipped and isinstance(self.installer, PXEInstaller): +- pxe_skipped = True +- continue + net.model = net_model + for disk in self._install_disks: + if disk_bus and not disk.bus: