summaryrefslogtreecommitdiffstats
path: root/yuminstall.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-02-14 04:47:28 +0000
committerJeremy Katz <katzj@redhat.com>2006-02-14 04:47:28 +0000
commit8a68d23546ec96f6601cc6ce157854dbb83fd086 (patch)
tree0d3ee8c6a6b90a0b97499253a971787e25f2487b /yuminstall.py
parent9b5970a2f904134c0ec70b883ad9b97edc268026 (diff)
downloadanaconda-8a68d23546ec96f6601cc6ce157854dbb83fd086.tar.gz
anaconda-8a68d23546ec96f6601cc6ce157854dbb83fd086.tar.xz
anaconda-8a68d23546ec96f6601cc6ce157854dbb83fd086.zip
2006-02-14 Jeremy Katz <katzj@redhat.com>
* yuminstall.py (YumBackend.getBestKernelByArch): Don't add a kernel if one is already selected.
Diffstat (limited to 'yuminstall.py')
-rw-r--r--yuminstall.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/yuminstall.py b/yuminstall.py
index eaa638c5c..dff4b8547 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -667,9 +667,14 @@ class YumBackend(AnacondaBackend):
return pkgs[0]
foundkernel = False
-
kpkg = getBestKernelByArch("kernel", self.ayum)
+ # 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-xen-hypervisor"):
+ if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:
+ foundkernel = True
+
if not foundkernel and os.path.exists("/proc/xen"):
try:
kxen = getBestKernelByArch("kernel-xen-guest", self.ayum)