1 |
From f2089e64945943c6d433f5474ba6ff25c44dff39 Mon Sep 17 00:00:00 2001 |
From cec120f81769c3baa639fa8394ae9b9b4278ac7b Mon Sep 17 00:00:00 2001 |
2 |
From: Shad L. Lords <slords@mail.com> |
From: Shad L. Lords <slords@mail.com> |
3 |
Date: Mon, 19 Oct 2009 07:53:15 -0600 |
Date: Mon, 19 Oct 2009 07:53:15 -0600 |
4 |
Subject: [PATCH] No warnings if kernel not upgraded |
Subject: [PATCH 01/16] No warnings if kernel not upgraded |
5 |
|
|
6 |
--- |
--- |
7 |
bootloader.py | 5 ----- |
bootloader.py | 5 ----- |
25 |
dosync() |
dosync() |
26 |
|
|
27 |
diff --git a/yuminstall.py b/yuminstall.py |
diff --git a/yuminstall.py b/yuminstall.py |
28 |
index 14c3334..b9d0415 100644 |
index efd3ab8..f587668 100644 |
29 |
--- a/yuminstall.py |
--- a/yuminstall.py |
30 |
+++ b/yuminstall.py |
+++ b/yuminstall.py |
31 |
@@ -1066,7 +1066,8 @@ class YumBackend(AnacondaBackend): |
@@ -1085,7 +1085,8 @@ class YumBackend(AnacondaBackend): |
32 |
|
|
33 |
if foundModule == 1: |
if foundModule == 1: |
34 |
for (n, arch, tag) in kernelVersions: |
for (n, arch, tag) in kernelVersions: |
35 |
- recreateInitrd(n, anaconda.rootPath) |
- recreateInitrd(n, anaconda.rootPath) |
36 |
+ if os.access("/boot/System.map-%s" %(n,), os.X_OK): |
+ if os.access("/boot/System.map-%s" %(n,), os.R_OK): |
37 |
+ recreateInitrd(n, anaconda.rootPath) |
+ recreateInitrd(n, anaconda.rootPath) |
38 |
|
|
39 |
def selectBestKernel(self, anaconda): |
def selectBestKernel(self, anaconda): |
40 |
"""Find the best kernel package which is available and select it.""" |
"""Find the best kernel package which is available and select it.""" |
41 |
@@ -1725,7 +1726,8 @@ class YumBackend(AnacondaBackend): |
@@ -1750,7 +1751,8 @@ class YumBackend(AnacondaBackend): |
42 |
# to the old method. |
# to the old method. |
43 |
if len(self._installedDriverModules) > 0 and len(self._installedDriverModules) == len(anaconda.id.extraModules): |
if len(self._installedDriverModules) > 0 and len(self._installedDriverModules) == len(anaconda.id.extraModules): |
44 |
for (n, arch, tag) in self.kernelVersionList(): |
for (n, arch, tag) in self.kernelVersionList(): |
45 |
- recreateInitrd(n, anaconda.rootPath) |
- recreateInitrd(n, anaconda.rootPath) |
46 |
+ if os.access("/boot/System.map-%s" %(n,), os.X_OK): |
+ if os.access("/boot/System.map-%s" %(n,), os.R_OK): |
47 |
+ recreateInitrd(n, anaconda.rootPath) |
+ recreateInitrd(n, anaconda.rootPath) |
48 |
else: |
else: |
49 |
modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules) |
modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules) |
50 |
self.copyExtraModules(anaconda, modulesList) |
self.copyExtraModules(anaconda, modulesList) |
51 |
-- |
-- |
52 |
1.5.5.6 |
1.7.4.1 |
53 |
|
|