2006-06-14 Jeremy Katz <katzj@redhat.com>

	* anaconda.spec: Bump version.

	* yuminstall.py (YumBackend.getBestKernelByArch): New xen kernel
	package naming.

3 files changed, 22 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 05337beb8..e67961e65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-14  Jeremy Katz  <katzj@redhat.com>
 
+	* anaconda.spec: Bump version.
+
+	* yuminstall.py (YumBackend.getBestKernelByArch): New xen kernel
+	package naming.
+
 	* scripts/mk-images: New xen kernel name.
 	* scripts/mk-images.x86: Likewise.
 
diff --git a/anaconda.spec b/anaconda.spec
index 3597cd18b..a9935c0f8 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.34
+Version: 11.1.0.35
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jun 14 2006 Jeremy Katz <katzj@redhat.com> - 11.1.0.35-1
+- new xen kernel names
+
 * Tue Jun 13 2006 David Cantrell <dcantrell@redhat.com> - 11.1.0.34-1
 - Fix logging segfaults in loader on x86_64
 - More release notes viewer fixes
diff --git a/yuminstall.py b/yuminstall.py
index 0e6f87848..f9c282937 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -775,37 +775,37 @@ class YumBackend(AnacondaBackend):
 
         # FIXME: this is a bit of a hack.  we shouldn't hard-code and
         # instead check by provides.  but alas.
-        for k in ("kernel", "kernel-smp", "kernel-xen0"):
+        for k in ("kernel", "kernel-smp", "kernel-xen0", "kernel-xen"):
             if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:            
                 foundkernel = True
 
         if not foundkernel and os.path.exists("/proc/xen"):
             try:
-                kxen = getBestKernelByArch("kernel-xenU", self.ayum)
-                log.info("selecting kernel-xenU package for kernel")
+                kxen = getBestKernelByArch("kernel-xen", self.ayum)
+                log.info("selecting kernel-xen package for kernel")
                 foundkernel = True
             except PackageSackError:
                 kxen = None
-                log.debug("no kernel-xenU package")
+                log.debug("no kernel-xen package")
             else:
                 self.ayum.install(po = kxen)
                 if len(self.ayum.tsInfo.matchNaevr(name="gcc")) > 0:
-                    log.debug("selecting kernel-xenU-devel")
-                    self.selectPackage("kernel-xenU-devel.%s" % (kxen.arch,))
+                    log.debug("selecting kernel-xen-devel")
+                    self.selectPackage("kernel-xen-devel.%s" % (kxen.arch,))
 
         if not foundkernel and flags.cmdline.has_key("xen0"):
             try:
-                kxen = getBestKernelByArch("kernel-xen0", self.ayum)
-                log.info("selecting kernel-xen0 package for kernel")
+                kxen = getBestKernelByArch("kernel-xen", self.ayum)
+                log.info("selecting kernel-xen package for kernel")
                 foundkernel = True
             except PackageSackError:
                 kxen = None
-                log.debug("no kernel-xen0 package")
+                log.debug("no kernel-xen package")
             else:
                 self.ayum.install(po = kxen)
                 if len(self.ayum.tsInfo.matchNaevr(name="gcc")) > 0:
-                    log.debug("selecting kernel-xen0-devel")
-                    self.selectPackage("kernel-xen0-devel.%s" % (kxen.arch,))
+                    log.debug("selecting kernel-xen-devel")
+                    self.selectPackage("kernel-xen-devel.%s" % (kxen.arch,))
 
         if not foundkernel and (isys.smpAvailable() or isys.htavailable()):
             try:
@@ -1103,7 +1103,8 @@ class YumBackend(AnacondaBackend):
         # nick is used to generate the lilo name
         for (ktag, nick) in [ ('kernel-smp', 'smp'),
                               ('kernel-xen0', 'xen0'),
-                              ('kernel-xenU', 'xenU') ]:
+                              ('kernel-xenU', 'xenU').
+                              ('kernel-xen', 'xen')]:
             tag = ktag.rsplit('-', 1)[1]
             for tsmbr in self.ayum.tsInfo.matchNaevr(name=ktag):
                 version = ( tsmbr.version + '-' + tsmbr.release + tag)