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

mkdsklsnode updates for netboot over HFI on AIX710

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7435 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz
2010-09-13 12:54:28 +00:00
parent 4a0d29f119
commit 050e35c2c9
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-server/lib/xcat/plugins/aixinstall.pm
View File

@@ -7679,17 +7679,13 @@ sub mkdsklsnode
my $netname = $nethash{$node}{'netname'};
if ($::NEWNAME)
if ($::NEWNAME)
{
$defcmd .= "-a if1='find_net $nodeshorthost 0' ";
} elsif (!$::HFI)
} else
{
$defcmd .=
"-a if1='find_net $nodeshorthost $mac_or_local_link_addr $adaptertype' ";
} else {
$defcmd .=
"-a if1='$netname $nodeshorthost $mac_or_local_link_addr $adaptertype' ";
}
$defcmd .= "-a cable_type1=N/A -a netboot_kernel=mp ";
@@ -8090,8 +8086,15 @@ sub checkNIMnetworks
# create new nim network def
# use the same network name as xCAT uses
my $devtype;
if ($::HFI)
{
$devtype = "hfi";
} else {
$devtype = "ent";
}
my $cmd =
qq~/usr/sbin/nim -o define -t ent -a net_addr=$nethash{$node}{net} -a snm=$nethash{$node}{mask} -a routing1='default $nethash{$node}{gateway}' $nethash{$node}{netname} 2>/dev/null~;
qq~/usr/sbin/nim -o define -t $devtype -a net_addr=$nethash{$node}{net} -a snm=$nethash{$node}{mask} -a routing1='default $nethash{$node}{gateway}' $nethash{$node}{netname} 2>/dev/null~;
my $output1 = xCAT::Utils->runcmd("$cmd", -1);
if ($::RUNCMD_RC != 0)
@@ -8194,7 +8197,7 @@ sub checkNIMnetworks
my $adapterhost;
my @ifcontent = split('\n',$ifone);
foreach my $line (@ifcontent) {
next if (/#/);
next if ($line =~ /^#/);
($junk1, $junk2, $adapterhost) = split(':', $line);
last;
}