diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-10-27 21:41:29 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-10-27 21:41:29 +0000 |
| commit | 63222e717563f5c16f7214d0660cf01bc5e60604 (patch) | |
| tree | 7c3f22444e5239e2d7ed8632b3d45288083f01d0 /yuminstall.py | |
| parent | 26d126138544061c14c13aa607be1dd0a4510df2 (diff) | |
| download | anaconda-63222e717563f5c16f7214d0660cf01bc5e60604.tar.gz anaconda-63222e717563f5c16f7214d0660cf01bc5e60604.tar.xz anaconda-63222e717563f5c16f7214d0660cf01bc5e60604.zip | |
2005-10-27 Jeremy Katz <katzj@redhat.com>
* bootloader.py (writeBootloader): Handle inconsistently named
kernel-xen-{guest,hypervisor} kernels
* yuminstall.py (YumBackend.doRepoSetup): Give full error on tty3.
(YumBackend.selectBestKernel): Temporarily allow installation of
xen-hypervisor kernel package by passing 'xen0' on kernel command line
(YumBackend.kernelVersionList): Remove obsolete cruft, add xen stuff
Diffstat (limited to 'yuminstall.py')
| -rw-r--r-- | yuminstall.py | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/yuminstall.py b/yuminstall.py index fe547c138..1a1f1b2f7 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -286,6 +286,7 @@ class YumBackend(AnacondaBackend): waitwin.next_task() waitwin.pop() except RepoError, e: + log.error("reading package metadata: %s" %(e,)) waitwin.pop() intf.messageWindow(_("Error"), _("Unable to read package metadata. This may be " @@ -302,7 +303,22 @@ class YumBackend(AnacondaBackend): kpkg = self.ayum.getBestPackage("kernel") - if isys.smpAvailable() or isys.htavailable(): + if not foundkernel and \ + (open("/proc/cmdline").read().find("xen0") != -1): + try: + kxen = self.ayum.getBestPackage("kernel-xen-hypervisor") + log.info("selecting kernel-xen-hypervisor package for kernel") + foundkernel = True + except PackageSackError: + kxen = None + log.debug("no kernel-xen-hypervisor package") + + self.ayum.tsInfo.addInstall(kxen) + if len(self.ayum.tsInfo.matchNaevr(name="gcc")) > 0: + log.debug("selecting kernel-xen-hypervisor-devel") + self.selectPackage("kernel-xen-hypervisor-devel") + + if not foundkernel and (isys.smpAvailable() or isys.htavailable()): try: ksmp = self.ayum.getBestPackage("kernel-smp") log.info("selected kernel-smp package for kernel") @@ -314,7 +330,7 @@ class YumBackend(AnacondaBackend): if ksmp and ksmp.returnSimple("arch") == kpkg.returnSimple("arch"): self.ayum.tsInfo.addInstall(ksmp) if len(self.ayum.tsInfo.matchNaevr(name="gcc")) > 0: - log.debug("selecting kernel-smp-devel ") + log.debug("selecting kernel-smp-devel") self.selectPackage("kernel-smp-devel") if not foundkernel: @@ -506,14 +522,10 @@ class YumBackend(AnacondaBackend): kernelVersions = [] # nick is used to generate the lilo name - for (ktag, nick) in [ ('kernel-summit', 'summit'), - ('kernel-bigmem', 'bigmem'), - ('kernel-hugemem', 'hugemem'), - ('kernel-smp', 'smp'), - ('kernel-tape', 'tape'), - ('kernel-pseries', ''), - ('kernel-iseries', '') ]: - tag = ktag.split('-')[1] + for (ktag, nick) in [ ('kernel-smp', 'smp'), + ('kernel-xen-hypervisor', 'hypervisor'), + ('kernel-xen-guest', 'guest') ]: + tag = ktag.rsplit('-', 1)[1] for tsmbr in self.ayum.tsInfo.matchNaevr(name=ktag): version = ( tsmbr.version + '-' + tsmbr.release + tag) kernelVersions.append((version, nick)) |