arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed the problem that gives error when noderes.nfsserver is not set for full disk install

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11491 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao
2012-02-06 22:15:50 +00:00
parent ff6d63cf0e
commit a7404f0c24
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
xCAT-server/lib/perl/xCAT/Template.pm
View File

@@ -22,6 +22,13 @@ my $idir;
my $node;
my %loggedrealms;
my $lastmachinepass;
my %tab_replacement=(
"noderes:nfsserver"=>"noderes:xcatmaster",
"noderes:tftpserver"=>"noderes:xcatmaster",
"noderes:xcatmaster"=>"site:key=master:value",
);
sub subvars {
my $self = shift;
@@ -412,7 +419,13 @@ sub tabdb
$tabh->close;
unless($ent and defined($ent->{$field})) {
unless ($blankok) {
$tmplerr="Unable to find requested $field from $table, with $key";
#$tmplerr="Unable to find requested $field from $table, with $key";
my $rep=get_replacement($table,$key,$field);
if ($rep) {
return tabdb($rep->[0], $rep->[1], $rep->[2]);
} else {
$tmplerr="Unable to find requested $field from $table, with $key"
}
}
return "";
#return "#TABLEBAD:$table:field $field not found#";
@@ -462,4 +475,25 @@ sub tabdb
#return "#TABLE:key not found#"
}
sub get_replacement {
my $table=shift;
my $key=shift;
my $field=shift;
my $rep;
if (exists($tab_replacement{"$table:$field"})) {
my $repstr=$tab_replacement{"$table:$field"};
if ($repstr) {
my @a=split(':', $repstr);
if (@a > 2) {
$rep=\@a;
} else {
$rep->[0]=$a[0];
$rep->[1]=$key;
$rep->[2]=$a[1];
}
}
}
return $rep;
}
1;