From cec120f81769c3baa639fa8394ae9b9b4278ac7b Mon Sep 17 00:00:00 2001 From: Shad L. Lords Date: Mon, 19 Oct 2009 07:53:15 -0600 Subject: [PATCH 01/17] No warnings if kernel not upgraded --- bootloader.py | 5 ----- yuminstall.py | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bootloader.py b/bootloader.py index 940478d..87d4072 100644 --- a/bootloader.py +++ b/bootloader.py @@ -211,11 +211,6 @@ def writeBootloader(anaconda): except bootloaderInfo.BootyNoKernelWarning: if not justConfigFile: w.pop() - if anaconda.intf: - anaconda.intf.messageWindow(_("Warning"), - _("No kernel packages were installed on your " - "system. Your boot loader configuration " - "will not be changed.")) dosync() diff --git a/yuminstall.py b/yuminstall.py index efd3ab8..f587668 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1085,7 +1085,8 @@ class YumBackend(AnacondaBackend): if foundModule == 1: for (n, arch, tag) in kernelVersions: - recreateInitrd(n, anaconda.rootPath) + if os.access("/boot/System.map-%s" %(n,), os.R_OK): + recreateInitrd(n, anaconda.rootPath) def selectBestKernel(self, anaconda): """Find the best kernel package which is available and select it.""" @@ -1750,7 +1751,8 @@ class YumBackend(AnacondaBackend): # to the old method. if len(self._installedDriverModules) > 0 and len(self._installedDriverModules) == len(anaconda.id.extraModules): for (n, arch, tag) in self.kernelVersionList(): - recreateInitrd(n, anaconda.rootPath) + if os.access("/boot/System.map-%s" %(n,), os.R_OK): + recreateInitrd(n, anaconda.rootPath) else: modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules) self.copyExtraModules(anaconda, modulesList) -- 1.7.1