summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authord.marlin <dmarlin@redhat.com>2012-08-07 17:56:38 -0500
committerBrian C. Lane <bcl@redhat.com>2012-08-07 16:19:54 -0700
commit8296fe55d6c413ffaa9b6afe73ec1af01c15635a (patch)
tree644f96509302e34235c58f25ed607f10e3371e25
parentce09a2a857443326f61cfb4b17cf1e3ccf3dc921 (diff)
downloadanaconda-8296fe55d6c413ffaa9b6afe73ec1af01c15635a.tar.gz
anaconda-8296fe55d6c413ffaa9b6afe73ec1af01c15635a.tar.xz
anaconda-8296fe55d6c413ffaa9b6afe73ec1af01c15635a.zip
Modify kernelPackages to select the right kernel for ARM systems.
Signed-off-by: Brian C. Lane <bcl@redhat.com>
-rw-r--r--pyanaconda/packaging/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index 8c5a5606c..4d56bfa31 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -600,9 +600,15 @@ class PackagePayload(Payload):
def kernelPackages(self):
from pyanaconda.isys import isPaeAvailable
kernels = ["kernel"]
+
if isPaeAvailable():
kernels.insert(0, "kernel-PAE")
+ # most ARM systems use platform-specific kernels
+ if iutil.isARM():
+ if anaconda.platform.armMachine is not None:
+ kernels = ["kernel-%s" % anaconda.platform.armMachine]
+
return kernels
def payloadInitialize(storage, ksdata, payload):