From 90ec9da165dfd7d94c9fefb32057825b74ec95e1 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 25 Mar 2013 20:52:51 +0000
Subject: [PATCH] Switch to server side fill in attempt for interface
 identifier in dns client config in windows

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15664 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/Template.pm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 703f6ce95..828c117ab 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -342,6 +342,17 @@ sub windows_dns_cfg {
 	unless ($noderestab) { return ""; }
 	$noderesent = $noderestab->getNodeAttribs($node,['nameservers'],prefetchcache=>1);
 	unless ($noderesent and $noderesent->{nameservers}) { return ""; }
+	my $mac="==PRINIC==";
+	my $mactab = xCAT::Table->new('mac',-create=>0);
+	if ($mactab) {
+		my $macent = $mactab->getNodeAttribs($node,['mac'],prefetchcache=>1);
+		if ($macent and $macent->{mac}) {
+			$mac=$macent->{mac};
+			$mac=~ s/!.*//;
+			$mac=~ s/\|.*//;
+			$mac =~ s/:/-/g;
+		}
+	}
 	my $nameservers =  $noderesent->{nameservers};
 	
 	my $domaintab = xCAT::Table->new('domain',-create=>0);
@@ -354,7 +365,7 @@ sub windows_dns_cfg {
 		$domain = $::XCATSITEVALS{domain};
 	}
 	my $componentxml = '<component name="Microsoft-Windows-DNS-Client" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'."\r\n<DNSDomain>$domain</DNSDomain>\r\n".
-	"<Interfaces><Interface wcm:action=\"add\">\r\n<Identifier>==PRINIC==</Identifier>\r\n<DNSServerSearchOrder>\r\n";
+	"<Interfaces><Interface wcm:action=\"add\">\r\n<Identifier>$mac</Identifier>\r\n<DNSServerSearchOrder>\r\n";
 	my $idx=1;
 	foreach (split /,/,$nameservers) {
 		$componentxml.="<IpAddress wcm:action=\"add\" wcm:keyValue=\"$idx\">$_</IpAddress>\r\n";