From 6327a8b3dab371841b3244dae16b01cbb0252db0 Mon Sep 17 00:00:00 2001
From: ligc <ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 10 May 2010 07:34:48 +0000
Subject: [PATCH] ipv6 fix
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6035 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
xCAT-server/share/xcat/ib/scripts/annotatelog | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/xCAT-server/share/xcat/ib/scripts/annotatelog b/xCAT-server/share/xcat/ib/scripts/annotatelog
index 294de6367..814215598 100644
--- a/xCAT-server/share/xcat/ib/scripts/annotatelog
+++ b/xCAT-server/share/xcat/ib/scripts/annotatelog
@@ -190,7 +190,7 @@ sub getArgs()
foreach my $node (@::NodeList)
{
#If there are IP addresses in NodeList, convert IP to hostname first
- if (isIpaddr($node))
+ if (isIpaddr($node)) # why? for xCAT, nodename can not be ip address...
{
my ($hostname, $ip) = getHost($node);
$node = $hostname;
@@ -260,6 +260,10 @@ sub isIpaddr
{
my ($class, $addr) = @_;
+ if ($addr =~ /:/) { #ipv6
+ return 1;
+ }
+
#print "addr=$addr\n";
if ($addr !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/)
{