diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-03-25 12:58:35 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-03-25 12:58:35 -0400 |
| commit | bfbb6a2527e3a943b8ace33ed589799b3b8978ab (patch) | |
| tree | 736dfc01114b4adc05de032c478492a13a9e644d | |
| parent | 6d8f6541c02bfb83630b10795a33500fa96e30c4 (diff) | |
| parent | fc143b80cdf9ad9b05d7b89e00fa8c77254d95c0 (diff) | |
| download | third_party-cobbler-bfbb6a2527e3a943b8ace33ed589799b3b8978ab.tar.gz third_party-cobbler-bfbb6a2527e3a943b8ace33ed589799b3b8978ab.tar.xz third_party-cobbler-bfbb6a2527e3a943b8ace33ed589799b3b8978ab.zip | |
Merge branch 'master' into devel
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | cobbler/action_import.py | 18 | ||||
| -rw-r--r-- | cobbler/settings.py | 2 | ||||
| -rw-r--r-- | config/settings | 2 |
5 files changed, 23 insertions, 2 deletions
@@ -18,6 +18,7 @@ Patches and other contributions from: Vito Laurenza <vitolaurenza@gmail.com> Adrian Likins <alikins@redhat.com> David Lutterkort <dlutter@redhat.com> + Lester M. <needwork@gmail.com> Jim Meyering <jim@meyering.net> Perry Myers <pmyers@redhat.com> Jack Neely <jjneely@ncsu.edu> @@ -10,6 +10,8 @@ Cobbler CHANGELOG - ??? - 0.8.3 - fix WebUI documentation URL - fix bug in /etc/cobbler/modules.conf regarding pluggable authn/z +- fix default flags for yumdownloader +- fix for RHEL 4u6 DVD/tree import x86_64 arch detection * Fri Feb 22 2008 - 0.8.2 - fix to webui to allow repos to be edited there on profile page 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): diff --git a/cobbler/settings.py b/cobbler/settings.py index e89f254..ccaf04d 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -62,7 +62,7 @@ DEFAULTS = { "xmlrpc_rw_enabled" : 0, "xmlrpc_rw_port" : 25152, "yum_post_install_mirror" : 1, - "yumdownloader_flags" : "-resolve" + "yumdownloader_flags" : "--resolve" } diff --git a/config/settings b/config/settings index 9355e71..ba709ae 100644 --- a/config/settings +++ b/config/settings @@ -36,4 +36,4 @@ xmlrpc_port: 25151 xmlrpc_rw_enabled: 0 xmlrpc_rw_port: 25152 yum_post_install_mirror: 0 -yumdownloader_flags: "-resolve" +yumdownloader_flags: "--resolve" |