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

ipv6 fix for mkdsklsnode

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6495 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc
2010-06-17 07:13:58 +00:00
parent 862d98633d
commit dc1b2ef8a4
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1814,6 +1814,7 @@ sub mknimimage
#6. Add ipv6 network
my $net;
my $prefixlength;
my $gw;
my $netname;
my $nettab = xCAT::Table->new('networks');
@@ -1830,6 +1831,7 @@ sub mknimimage
#use the first IPv6 network in networks table
if ($enet->{'net'} =~ /:/) { #ipv6
$net = $enet->{'net'};
$prefixlength = $enet->{'mask'};
$gw = $enet->{'gateway'};
$netname = $enet->{'netname'};
last;
@@ -1842,7 +1844,8 @@ sub mknimimage
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
$nimcmd = qq~nim -o define -t ent6 -a net_addr=$net -a routing1="default $gw" $netname~;
my $mask = xCAT::NetworkUtils->prefixtonetmask($prefixlength);
$nimcmd = qq~nim -o define -t ent6 -a net_addr=$net -a snm=$mask -a routing1="default $gw" $netname~;
if ($::VERBOSE)
{
my $rsp;
@@ -4075,7 +4078,7 @@ sub update_rhosts
#my $IP = inet_ntoa(inet_aton($node));
my $IP = xCAT::NetworkUtils->getipaddr($node);
chomp $IP;
unless ($IP =~ /\d+\.\d+\.\d+\.\d+/)
unless (($IP =~ /\d+\.\d+\.\d+\.\d+/) || ($IP =~ /:/))
{
my $rsp;
push @{$rsp->{data}},
@@ -6819,7 +6822,7 @@ sub mkdsklsnode
#my $IP = inet_ntoa(inet_aton($node));
my $IP = xCAT::NetworkUtils->getipaddr($node);
chomp $IP;
unless ($IP =~ /\d+\.\d+\.\d+\.\d+/)
unless (($IP =~ /\d+\.\d+\.\d+\.\d+/) || ($IP =~ /:/))
{
my $rsp;
push @{$rsp->{data}},
@@ -6880,6 +6883,9 @@ sub mkdsklsnode
}
# define the node
my $mac_or_local_link_addr;
my $adaptertype;
my $netmask;
my $defcmd = "/usr/sbin/nim -o define -t $type ";
if ($::NEWNAME)
{
@@ -6888,12 +6894,24 @@ sub mkdsklsnode
else
{
$objhash{$node}{'mac'} =~ s/://g; # strip out colons if any
if (xCAT::NetworkUtils->getipaddr($nodeshorthost) =~ /:/) #ipv6 node
{
$mac_or_local_link_addr = xCAT::NetworkUtils->linklocaladdr($objhash{$node}{'mac'});
$adaptertype = "ent6";
$netmask = xCAT::NetworkUtils->prefixtomask($nethash{$node}{'mask'});
} else {
$mac_or_local_link_addr = $objhash{$node}{'mac'};
# only support Ethernet for management interfaces
$adaptertype = "ent";
$netmask = $nethash{$node}{'mask'};
}
$defcmd .=
"-a if1='find_net $nodeshorthost $objhash{$node}{'mac'}' ";
"-a if1='find_net $nodeshorthost $mac_or_local_link_addr $adaptertype' ";
}
$defcmd .= "-a cable_type1=N/A -a netboot_kernel=mp ";
$defcmd .=
"-a net_definition='ent $nethash{$node}{'mask'} $nethash{$node}{'gateway'}' ";
"-a net_definition='$adaptertype $netmask $nethash{$node}{'gateway'}' ";
$defcmd .= "-a net_settings1='$speed $duplex' ";
# add any additional supported attrs from cmd line