xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-29 15:51:18 +00:00
Code Issues Releases Wiki Activity

fix defect #4717 [FVT]:sles11.4 diskful installation failed with netboot=yaboot

Browse Source
This commit is contained in:
immarvin
2015-06-29 22:56:24 -04:00
parent 78cd80b9d3
commit 53b4d81a4f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/Utils.pm
View File

@@ -4592,7 +4592,7 @@ sub lookupNetboot{
if ($osarch =~ /^x86_64$/i){
$ret= "xnba,pxe";
}elsif($osarch =~ /^ppc64$/i){
if(($osv =~ /rh/i and $osn < 7) or ($osv =~ /sles/i and $osn < 12)){
if(($osv =~ /rh/i and $osn < 7) or ($osv =~ /sles/i and ($osn < 11 or ($osn == 11 and $osm < 4)))){
$ret="yaboot";
}else{
$ret="grub2,grub2-tftp,grub2-http";

13
xCAT-server/lib/perl/xCAT/SvrUtils.pm
View File

@@ -14,6 +14,7 @@ require xCAT::TableUtils;
require xCAT::NetworkUtils;
use File::Basename;
use File::Path;
use strict;
use Exporter;
our @ISA = qw/Exporter/;
@@ -639,7 +640,7 @@ sub update_tables_with_templates
#now get all the profile names for full installation
my %profiles=();
my @tmplfiles=glob($cuspath."/{compute,service}.*tmpl");
my @tmplfiles=glob($cuspath."/*.tmpl");
foreach (@tmplfiles) {
my $tmpf=basename($_);
#get the profile name out of the file, TODO: this does not work if the profile name contains the '.'
@@ -653,7 +654,7 @@ sub update_tables_with_templates
#print "$tmpf\n";
$profiles{$tmpf}=1;
}
@tmplfiles=glob($defpath."/{compute,service}.*tmpl");
@tmplfiles=glob($defpath."/*.tmpl");
foreach (@tmplfiles) {
my $tmpf=basename($_);
#get the profile name out of the file, TODO: this does not work if the profile name contains the '.'
@@ -844,7 +845,7 @@ sub update_tables_with_mgt_image
#now get all the profile names for full installation
my %profiles=();
my @tmplfiles=glob($cuspath."/{compute,service}.*tmpl");
my @tmplfiles=glob($cuspath."/*.tmpl");
foreach (@tmplfiles) {
my $tmpf=basename($_);
#get the profile name out of the file, TODO: this does not work if the profile name contains the '.'
@@ -853,7 +854,7 @@ sub update_tables_with_mgt_image
#print "$tmpf\n";
$profiles{$tmpf}=1;
}
@tmplfiles=glob($defpath."/{compute,service}.*tmpl");
@tmplfiles=glob($defpath."/*.tmpl");
foreach (@tmplfiles) {
my $tmpf=basename($_);
#get the profile name out of the file, TODO: this does not work if the profile name contains the '.'
@@ -1048,7 +1049,7 @@ sub update_tables_with_diskless_image
if ($profile) {
$profiles{$profile} = 1;
} else {
my @tmplfiles=glob($cuspath."/compute.*pkglist");
my @tmplfiles=glob($cuspath."/*.pkglist");
foreach (@tmplfiles) {
my $tmpf=basename($_);
#get the profile name out of the file, TODO: this does not work if the profile name contains the '.'
@@ -1056,7 +1057,7 @@ sub update_tables_with_diskless_image
$tmpf = $1;
$profiles{$tmpf}=1;
}
@tmplfiles=glob($defpath."/compute.*pkglist");
@tmplfiles=glob($defpath."/*.pkglist");
foreach (@tmplfiles) {
my $tmpf=basename($_);
#get the profile name out of the file, TODO: this does not work if the profile name contains the '.'