1 |
slords |
1.3 |
From 40d3dfdbe56124715fcb30de312f7ba98a90e2ea Mon Sep 17 00:00:00 2001 |
2 |
slords |
1.1 |
From: Shad L. Lords <slords@mail.com> |
3 |
|
|
Date: Mon, 19 Oct 2009 07:53:15 -0600 |
4 |
|
|
Subject: [PATCH] No warnings if kernel not upgraded |
5 |
|
|
|
6 |
|
|
--- |
7 |
|
|
bootloader.py | 5 ----- |
8 |
|
|
yuminstall.py | 6 ++++-- |
9 |
|
|
2 files changed, 4 insertions(+), 7 deletions(-) |
10 |
|
|
|
11 |
|
|
diff --git a/bootloader.py b/bootloader.py |
12 |
|
|
index 940478d..87d4072 100644 |
13 |
|
|
--- a/bootloader.py |
14 |
|
|
+++ b/bootloader.py |
15 |
|
|
@@ -211,11 +211,6 @@ def writeBootloader(anaconda): |
16 |
|
|
except bootloaderInfo.BootyNoKernelWarning: |
17 |
|
|
if not justConfigFile: |
18 |
|
|
w.pop() |
19 |
|
|
- if anaconda.intf: |
20 |
|
|
- anaconda.intf.messageWindow(_("Warning"), |
21 |
|
|
- _("No kernel packages were installed on your " |
22 |
|
|
- "system. Your boot loader configuration " |
23 |
|
|
- "will not be changed.")) |
24 |
|
|
|
25 |
|
|
dosync() |
26 |
|
|
|
27 |
|
|
diff --git a/yuminstall.py b/yuminstall.py |
28 |
slords |
1.3 |
index 14c3334..a5028b0 100644 |
29 |
slords |
1.1 |
--- a/yuminstall.py |
30 |
|
|
+++ b/yuminstall.py |
31 |
slords |
1.2 |
@@ -1066,7 +1066,8 @@ class YumBackend(AnacondaBackend): |
32 |
slords |
1.1 |
|
33 |
|
|
if foundModule == 1: |
34 |
|
|
for (n, arch, tag) in kernelVersions: |
35 |
|
|
- recreateInitrd(n, anaconda.rootPath) |
36 |
slords |
1.3 |
+ if os.access("/boot/System.map-%s" %(n,), os.R_OK): |
37 |
slords |
1.1 |
+ recreateInitrd(n, anaconda.rootPath) |
38 |
|
|
|
39 |
|
|
def selectBestKernel(self, anaconda): |
40 |
|
|
"""Find the best kernel package which is available and select it.""" |
41 |
slords |
1.2 |
@@ -1725,7 +1726,8 @@ class YumBackend(AnacondaBackend): |
42 |
slords |
1.1 |
# to the old method. |
43 |
|
|
if len(self._installedDriverModules) > 0 and len(self._installedDriverModules) == len(anaconda.id.extraModules): |
44 |
|
|
for (n, arch, tag) in self.kernelVersionList(): |
45 |
|
|
- recreateInitrd(n, anaconda.rootPath) |
46 |
slords |
1.3 |
+ if os.access("/boot/System.map-%s" %(n,), os.R_OK): |
47 |
slords |
1.1 |
+ recreateInitrd(n, anaconda.rootPath) |
48 |
|
|
else: |
49 |
|
|
modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules) |
50 |
|
|
self.copyExtraModules(anaconda, modulesList) |
51 |
|
|
-- |
52 |
|
|
1.5.5.6 |
53 |
|
|
|