diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2008-03-25 12:57:27 -0400 |
---|---|---|
committer | Michael DeHaan <mdehaan@redhat.com> | 2008-03-25 12:57:27 -0400 |
commit | fc143b80cdf9ad9b05d7b89e00fa8c77254d95c0 (patch) | |
tree | 6ed8a4f3381201b9255335ac6d28fa5858c03ee2 /cobbler/action_import.py | |
parent | 254c8d1a7318356b8b9ef99948110e86717f7548 (diff) | |
download | third_party-cobbler-fc143b80cdf9ad9b05d7b89e00fa8c77254d95c0.tar.gz third_party-cobbler-fc143b80cdf9ad9b05d7b89e00fa8c77254d95c0.tar.xz third_party-cobbler-fc143b80cdf9ad9b05d7b89e00fa8c77254d95c0.zip |
Apply patch to fix detection of x86_64 arches for imports of RHEL 4u6.
Diffstat (limited to 'cobbler/action_import.py')
-rw-r--r-- | cobbler/action_import.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/cobbler/action_import.py b/cobbler/action_import.py index 164f7bb..db09818 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -565,6 +565,24 @@ class Importer: elif x.find("ia64") != -1: foo["result"] = "ia64" return + + # This extra code block is a temporary fix for rhel4.x 64bit [x86_64] + # distro ARCH identification-- L.M. + # NOTE: eventually refactor to merge in with the above block + for x in fnames: + if not x.endswith("rpm"): + continue + if x.find("kernel-largesmp") != -1: + print _("- kernel header found: %s") % x + if x.find("i386") != -1: + foo["result"] = "x86" + return + elif x.find("x86_64") != -1: + foo["result"] = "x86_64" + return + elif x.find("ia64") != -1: + foo["result"] = "ia64" + return def learn_arch_from_tree(self,dirname): |