From a1f2d1a96fb6efaa68b77a5b61c6dc4aedce89ff Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 11 Jan 2010 19:12:37 +0000 Subject: [PATCH] -Lowercase mac addresses by default (some straightforward usage of the field prefers lowercase) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4934 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/nodediscover.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm index e56077d1d..4b92ea9e0 100644 --- a/xCAT-server/lib/xcat/plugins/nodediscover.pm +++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm @@ -166,6 +166,7 @@ sub process_request { if ($forcenic == -1) { #if force to skip, go to next nic next; } + my $currmac = lc($ifinfo[2]); if ($ifinfo[3]) { (my $ip,my $netbits) = split /\//,$ifinfo[3]; if ($ip =~ /\d+\.\d+\.\d+\.\d+/) { @@ -182,13 +183,13 @@ sub process_request { $nrtab->setNodeAttribs($node,{nfsserver=>xCAT::Utils->my_ip_facing($hosttag)}); } $usednames{$hosttag}=1; - $macstring .= $ifinfo[2]."!".$hosttag."|"; + $macstring .= $$currmac."!".$hosttag."|"; } else { - if ($forcenic == 1) { $macstring .= $ifinfo[2]."|"; } else { $macstring .= $ifinfo[2]."!*NOIP*|"; } + if ($forcenic == 1) { $macstring .= $currmac."|"; } else { $macstring .= $currmac."!*NOIP*|"; } } - } + } } else { - if ($forcenic == 1) { $macstring .= $ifinfo[2]."|"; } + if ($forcenic == 1) { $macstring .= $currmac."|"; } } } $macstring =~ s/\|\z//;