diff --git a/python-virtinst.spec b/python-virtinst.spec index 0bb3529..9030db1 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -11,7 +11,7 @@ Summary: Python modules for starting Xen guest installations Name: python-%{appname} Version: 0.300.3 -Release: 6%{_extra_release} +Release: 7%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz Patch1: %{appname}-%{version}-keep-qemu-cdrom.patch Patch2: %{appname}-%{version}-fix-default-arch.patch @@ -20,6 +20,7 @@ Patch4: %{appname}-%{version}-update-polish-trans.patch Patch5: %{appname}-%{version}-i18n.patch Patch6: %{appname}-%{version}-update-serbian-trans.patch Patch7: %{appname}-%{version}-boot-dir.patch +Patch8: %{appname}-%{version}-hvm-kernel.patch License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +57,7 @@ virtinst in a command line mode. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build python setup.py build @@ -86,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-image %changelog +* Wed Jun 4 2008 Daniel P. Berrange - 0.300.3-7.fc9 +- Fix fetching of HVM kernels (rhbz #450032) + * Fri May 9 2008 Daniel P. Berrange - 0.300.3-6.fc9 - Use /var/lib/libvirt/boot for kernel/initrd images (rhbz #445854) diff --git a/virtinst-0.300.3-hvm-kernel.patch b/virtinst-0.300.3-hvm-kernel.patch new file mode 100644 index 0000000..967d7dd --- /dev/null +++ b/virtinst-0.300.3-hvm-kernel.patch @@ -0,0 +1,55 @@ +changeset: 406:5f10c7c171af +user: "Daniel P. Berrange " +date: Mon Apr 21 18:05:55 2008 -0400 +files: virtinst/OSDistro.py +description: +Fix fetching of hvm kernel/initrds + + +diff -r 6462dfd3e606 -r 5f10c7c171af virtinst/OSDistro.py +--- a/virtinst/OSDistro.py Tue Apr 08 15:35:49 2008 -0400 ++++ b/virtinst/OSDistro.py Mon Apr 21 18:05:55 2008 -0400 +@@ -79,7 +79,7 @@ + initrdpath = self.treeinfo.get("images-%s" % type, "initrd") + else: + # fall back to old code +- if self.type is None: ++ if self.type is None or self.type == "hvm": + kernelpath = "images/pxeboot/vmlinuz" + initrdpath = "images/pxeboot/initrd.img" + else: +@@ -359,7 +359,7 @@ + class DebianDistro(Distro): + def isValidStore(self, fetcher, progresscb): + # Don't support any paravirt installs +- if self.type is not None: ++ if self.type is not None and self.type != "hvm": + return False + + file = None +@@ -400,21 +400,21 @@ + class UbuntuDistro(Distro): + def isValidStore(self, fetcher, progresscb): + # Don't support any paravirt installs +- if self.type is not None: ++ if self.type is not None and self.type != "hvm": + return False + return False + + class GentooDistro(Distro): + def isValidStore(self, fetcher, progresscb): + # Don't support any paravirt installs +- if self.type is not None: ++ if self.type is not None and self.type != "hvm": + return False + return False + + class MandrivaDistro(Distro): + def isValidStore(self, fetcher, progresscb): + # Don't support any paravirt installs +- if self.type is not None: ++ if self.type is not None and self.type != "hvm": + return False + + # Mandriva websites / media appear to have a VERSION +