From 68717ef6d99f00e8b6d6a81868e8582ea6ebba75 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 7 Apr 2010 11:13:42 +0000
Subject: [PATCH]  fix defect 2983092 use /opt/xcat and not hardcode path to
 makenamed.conf

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5697 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/AAsn.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index 4744aea14..c3373ac22 100644
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -701,8 +701,14 @@ sub setup_FTP
 sub setup_DNS
 {
 
+    my $XCATROOT = "/opt/xcat";    # default
+
+    if ($ENV{'XCATROOT'})
+    {
+        $XCATROOT = $ENV{'XCATROOT'};
+    }
     # setup the named.conf file
-    system("/opt/xcat/sbin/makenamed.conf");
+    system("$XCATROOT/sbin/makenamed.conf");
 
     # turn DNS on