From 11286751f9ef9bbc59b59680e47da4986b6ed2d8 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 4 Apr 2008 15:52:39 +0000
Subject: [PATCH] Add CentOS 5.1 32-bit x86 discid, have SLES10 support 32-bit
 installation media

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@977 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server-2.0/lib/xcat/plugins/anaconda.pm |  1 +
 xCAT-server-2.0/lib/xcat/plugins/sles.pm     | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/xCAT-server-2.0/lib/xcat/plugins/anaconda.pm b/xCAT-server-2.0/lib/xcat/plugins/anaconda.pm
index a42463e93..35f36ce27 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/anaconda.pm
@@ -20,6 +20,7 @@ my %distnames = (
   "1156364963.862322" => "centos4.4",
   "1178480581.024704" => "centos4.5",
   "1195929648.203590" => "centos5.1",
+  "1195929637.060433" => "centos5.1",
   "1195488871.805863" => "centos4.6",
   "1195487524.127458" => "centos4.6",
   "1170973598.629055" => "rhelc5",
diff --git a/xCAT-server-2.0/lib/xcat/plugins/sles.pm b/xCAT-server-2.0/lib/xcat/plugins/sles.pm
index 1501a90f0..8393554f2 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/sles.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/sles.pm
@@ -134,10 +134,16 @@ sub mkinstall
         xCAT::Postage->writescript($node, "/install/postscripts/" . $node);
         if (
             (
-                 $arch =~ /x86/
+             $arch =~ /x86_64/
              and -r "/install/$os/$arch/1/boot/$arch/loader/linux"
              and -r "/install/$os/$arch/1/boot/$arch/loader/initrd"
             )
+            or
+            (
+             $arch =~ /x86$/
+             and -r "/install/$os/$arch/1/boot/i386/loader/linux"
+             and -r "/install/$os/$arch/1/boot/i386/loader/initrd"
+            )
             or ($arch =~ /ppc/ and -r "/install/$os/$arch/1/suseboot/inst64")
           )
         {
@@ -146,12 +152,17 @@ sub mkinstall
             unless ($doneimgs{"$os|$arch"})
             {
                 mkpath("/tftpboot/xcat/$os/$arch");
-                if ($arch =~ /x86/)
+                if ($arch =~ /x86_64/)
                 {
                     copy("/install/$os/$arch/1/boot/$arch/loader/linux",
                          "/tftpboot/xcat/$os/$arch/");
                     copy("/install/$os/$arch/1/boot/$arch/loader/initrd",
                          "/tftpboot/xcat/$os/$arch/");
+                } elsif ($arch =~ /x86/) {
+                    copy("/install/$os/$arch/1/boot/i386/loader/linux",
+                         "/tftpboot/xcat/$os/$arch/");
+                    copy("/install/$os/$arch/1/boot/i386/loader/initrd",
+                         "/tftpboot/xcat/$os/$arch/");
                 }
                 elsif ($arch =~ /ppc/)
                 {