xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 11:22:27 +00:00
Code Issues Releases Wiki Activity

-Revert sles yaboot overwrite with functional yaboot-xcat

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6218 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2010-05-25 13:29:24 +00:00
parent 803570a243
commit d76eacde2d
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/sles.pm
View File

@@ -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;
}

13
xCAT-server/lib/xcat/plugins/yaboot.pm
View File

@@ -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);
}
}