From d76eacde2dc555e3b4ca1c40c2dd72c2d086bbf7 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 25 May 2010 13:29:24 +0000
Subject: [PATCH] -Revert sles yaboot overwrite with functional yaboot-xcat

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6218 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/sles.pm   |  8 --------
 xCAT-server/lib/xcat/plugins/yaboot.pm | 13 -------------
 2 files changed, 21 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 63aaafa66..6488462aa 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -154,9 +154,6 @@ sub mknetboot
             $platform = "sles";
             #TODO: should get the $pkgdir value from the linuximage table
             $pkgdir = "$installroot/$osver/$arch";
-            if($osver =~ m/sles11/ and -r "$pkgdir/1/suseboot/yaboot") {
-                copy("$pkgdir/1/suseboot/yaboot", "/tftpboot/");
-            }
         }elsif($osver =~ /suse.*/){
             $platform = "sles";
 	    }
@@ -604,11 +601,6 @@ sub mkinstall
                 {
                     copy("$pkgdir/1/suseboot/inst64",
                          "/tftpboot/xcat/$os/$arch");
-                    #special case for sles 11 and 11.x 
-                    if ( $os =~ m/sles11/ and -r "$pkgdir/1/suseboot/yaboot")
-                    {
-                        copy("$pkgdir/1/suseboot/yaboot", "/tftpboot/");
-                    }
                 }
                 $doneimgs{"$os|$arch"} = 1;
             }
diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index c3361babb..1a8daeb1e 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -162,21 +162,8 @@ sub setstate {
   foreach $ip (keys %ipaddrs) {
    my @ipa=split(/\./,$ip);
    my $pname = sprintf("%02x%02x%02x%02x",@ipa);
-   #special case for sles 11
-   my $mac = lc($machash{$node}->[0]->{mac});
-   $mac =~ s/!.*//;
-   $mac =~ s/\|.*//;
-   if (! (grep /\:/, $mac) ) {
-      $mac =~ s/(..)(..)(..)(..)(..)(..)/$1:$2:$3:$4:$5:$6/;
-   }
-   my @mac_substr = split /\:/, $mac;
-   my $sles_yaboot_link = sprintf("yaboot.conf-%s-%s-%s-%s-%s-%s", @mac_substr);
    unlink($tftpdir."/etc/".$pname);
    link($tftpdir."/etc/".$node,$tftpdir."/etc/".$pname);
-
-   # Add the yaboot.conf-%s-%s-%s-%s-%s-%s for both the rh and sles
-   unlink($tftpdir . "/" . $sles_yaboot_link);
-   link($tftpdir."/etc/".$node, $tftpdir . '/' . $sles_yaboot_link);
   }
 }