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

IPv6 fix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6499 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc
2010-06-17 11:31:52 +00:00
parent 4b5553bfe6
commit 63d0473b9b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1725,9 +1725,18 @@ sub mknimimage
}
#get the link local address for the primary nim interface
my $linklocaladdr;
$nimcmd = qq~ifconfig $pif~;
$nimout =
xCAT::InstUtils->xcmd($callback, $subreq, "xdsh", $nimprime, $nimcmd,
0);
foreach my $line (split(/\n/,$nimout))
{
if ($line =~ /$pif\s+\d+\s+(fe80.*?)\s+/)
#ignore the address fe80::1%2/64
if ($line =~ /%/)
{
next;
}
if ($line =~ /inet6\s+(fe80.*?)\//)
{
$linklocaladdr = $1;
last;
@ -1844,7 +1853,7 @@ sub mknimimage
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
my $mask = xCAT::NetworkUtils->prefixtonetmask($prefixlength);
my $mask = xCAT::NetworkUtils->prefixtomask($prefixlength);
$nimcmd = qq~nim -o define -t ent6 -a net_addr=$net -a snm=$mask -a routing1="default $gw" $netname~;
if ($::VERBOSE)
{