rpms/python-virtinst/F-7 virtinst-0.200.0-cdrom-src.patch, NONE, 1.1 virtinst-0.200.0-kvm-kernel.patch, NONE, 1.1 python-virtinst.spec, 1.21, 1.22

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26530

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.200.0-cdrom-src.patch 
	virtinst-0.200.0-kvm-kernel.patch 
Log Message:
Fixed post-install CDROm source and KVM kernel config

virtinst-0.200.0-cdrom-src.patch:

--- NEW FILE virtinst-0.200.0-cdrom-src.patch ---
diff -rup virtinst-0.200.0/virtinst/Guest.py virtinst-0.200.0.new/virtinst/Guest.py
--- virtinst-0.200.0/virtinst/Guest.py	2007-07-18 22:04:21.000000000 -0400
+++ virtinst-0.200.0.new/virtinst/Guest.py	2007-09-06 23:11:54.000000000 -0400
@@ -151,9 +151,7 @@ class VirtualDisk:
                 ret += "      <driver name='%(name)s'/>\n" % { "name": self.driver_name }
             else:
                 ret += "      <driver name='%(name)s' type='%(type)s'/>\n" % { "name": self.driver_name, "type": self.driver_type }
-        if self.path is None:
-            ret += "      <source %(typeattr)s=''/>\n" % { "typeattr": typeattr }
-        else:
+        if self.path is not None:
             ret += "      <source %(typeattr)s='%(disk)s'/>\n" % { "typeattr": typeattr, "disk": self.path }
         ret += "      <target dev='%(disknode)s'/>\n" % { "disknode": disknode }
         if self.read_only:

virtinst-0.200.0-kvm-kernel.patch:

--- NEW FILE virtinst-0.200.0-kvm-kernel.patch ---
changeset:   254:b33e850305be
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Aug 21 17:46:58 2007 -0400
summary:     Fixed XML generated for kernel/initrd installs of KVM

diff -r 7220fc5059e4 -r b33e850305be virtinst/DistroManager.py
--- a/virtinst/DistroManager.py	Tue Aug 21 17:42:12 2007 -0400
+++ b/virtinst/DistroManager.py	Tue Aug 21 17:46:58 2007 -0400
@@ -692,7 +692,7 @@ class DistroInstaller(Guest.Installer):
             else:
                 osblob += "    <type>%s</type>\n" % type
 
-            if self.install["kernel"]:
+            if install and self.install["kernel"]:
                 osblob += "    <kernel>%s</kernel>\n"   % self.install["kernel"]
                 osblob += "    <initrd>%s</initrd>\n"   % self.install["initrd"]
                 osblob += "    <cmdline>%s</cmdline>\n" % self.install["extraargs"]



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-7/python-virtinst.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-virtinst.spec	26 Jul 2007 15:07:55 -0000	1.21
+++ python-virtinst.spec	7 Sep 2007 17:33:50 -0000	1.22
@@ -11,7 +11,7 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.200.0
-Release: 2%{_extra_release}
+Release: 3%{_extra_release}
 Source0: http://virt-manager.et.redhat.com/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 License: GPL
 Group: Development/Libraries
@@ -25,6 +25,8 @@
 BuildRequires: python-devel
 Obsoletes: python-xeninst < 0.97.0
 Patch1: %{appname}-%{version}-default-arch.patch
+Patch2: %{appname}-%{version}-cdrom-src.patch
+Patch3: %{appname}-%{version}-kvm-kernel.patch
 
 %description
 virtinst is a module to help in starting installations of Fedora/Red
@@ -39,6 +41,8 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 python setup.py build
@@ -67,6 +71,10 @@
 %{_bindir}/virt-clone
 
 %changelog
+* Thu Sep  6 2007 Daniel P. Berrange <berrange at redhat.com> - 0.200.0-3.fc7
+- Fixed CDROM source post-install (rhbz #260981)
+- Fixed kernel for post-install config with KVM guests
+
 * Thu Jul 26 2007 Daniel P. Berrange <berrange at redhat.com> - 0.200.0-2.fc7
 - Fixed default architecture