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

nfsserver attribute is not the required field for nodes on ubuntu

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14647 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005
2012-12-14 05:43:03 +00:00
parent 9f45ee17b4
commit 3b08c74368
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xCAT-server/lib/xcat/plugins/debian.pm
View File

@@ -411,7 +411,7 @@ sub mkinstall
my %osents = %{$ostab->getNodesAttribs(\@nodes, ['profile', 'os', 'arch', 'provmethod'])};
my %rents =
%{$restab->getNodesAttribs(\@nodes,
['nfsserver', 'primarynic', 'installnic'])};
['xcatmaster', 'nfsserver', 'primarynic', 'installnic'])};
my %hents =
%{$hmtab->getNodesAttribs(\@nodes,
['serialport', 'serialspeed', 'serialflow'])};
@@ -674,11 +674,17 @@ sub mkinstall
# 'serialport', 'serialspeed', 'serialflow'
# ]
# );
unless ($ent and $ent->{nfsserver})
my $instserver;
if ($ent and $ent->{xcatmaster}){
$instserver = $ent->{xcatmaster};
}
else{
$instserver = '!myipfn!';
}
if ($ent and $ent->{nfsserver})
{
$callback->({error => ["No noderes.nfsserver defined for " . $node],
errorcode => [1]});
next;
$instserver = $ent->{nfsserver};
}
#if ($platform eq "ubuntu"){
# my $kcmdline =
@@ -689,7 +695,7 @@ sub mkinstall
#} else
#{
my $kcmdline = "nofb utf8 auto url=http://"
. $ent->{nfsserver}
. $instserver
. "$installroot/autoinst/"
. $node;
#}