From 254c8d1a7318356b8b9ef99948110e86717f7548 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 13 Mar 2008 16:48:19 -0400 Subject: Fix default flags for yumdownloader --- CHANGELOG | 1 + cobbler/settings.py | 2 +- config/settings | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a70ca98..bd72c41 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ Cobbler CHANGELOG - Make createrepo get run for local cobbler reposync invocations as needed - fix WebUI documentation URL - fix bug in /etc/cobbler/modules.conf regarding pluggable authn/z +- fix default flags for yumdownloader * Fri Feb 22 2008 - 0.8.2 - fix to webui to allow repos to be edited there on profile page diff --git a/cobbler/settings.py b/cobbler/settings.py index 581403c..8c8be03 100644 --- a/cobbler/settings.py +++ b/cobbler/settings.py @@ -61,7 +61,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" -- cgit From fc143b80cdf9ad9b05d7b89e00fa8c77254d95c0 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 25 Mar 2008 12:57:27 -0400 Subject: Apply patch to fix detection of x86_64 arches for imports of RHEL 4u6. --- AUTHORS | 1 + CHANGELOG | 1 + cobbler/action_import.py | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/AUTHORS b/AUTHORS index a73f8a0..c6d954c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,6 +15,7 @@ Patches and other contributions from: Mihai Ibanescu Adrian Likins David Lutterkort + Lester M. Jim Meyering Perry Myers Jack Neely diff --git a/CHANGELOG b/CHANGELOG index bd72c41..686ec3d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ Cobbler CHANGELOG - 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): -- cgit