[PATCH 5/5] yuminstall: don't look for kernel-xen anymore

[Mark McLoughlin <markmc redhat com>]

We don't have a kernel-xen anymore, so we should
pick up the default kernel just fine.

Signed-off-by: Mark McLoughlin <markmc redhat com>
---
 yuminstall.py |   18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/yuminstall.py b/yuminstall.py
index 88f8d1e..65047b4 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1273,27 +1273,11 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
 
         # 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", "kernel-xen",
-                  "kernel-PAE"):
+        for k in ("kernel", "kernel-smp", "kernel-PAE"):
             if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:
                 self.selectModulePackages(anaconda, k)
                 foundkernel = True
 
-        if not foundkernel and os.path.exists("/proc/xen"):
-            try:
-                kxen = getBestKernelByArch("kernel-xen", self.ayum)
-                log.info("selecting kernel-xen package for kernel")
-                foundkernel = True
-            except PackageSackError:
-                kxen = None
-                log.debug("no kernel-xen package")
-            else:
-                self.ayum.install(po = kxen)
-                self.selectModulePackages(anaconda, kxen.name)
-                if len(self.ayum.tsInfo.matchNaevr(name="gcc")) > 0:
-                    log.debug("selecting kernel-xen-devel")
-                    self.selectPackage("kernel-xen-devel.%s" % (kxen.arch,))
-
         if not foundkernel and (isys.smpAvailable() or isys.htavailable()):
             try:
                 ksmp = getBestKernelByArch("kernel-smp", self.ayum)
-- 
1.5.4.1