From 620509cc9bbe5c502d89ff4f3894609d145555e7 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 23 Sep 2009 18:35:19 +0000
Subject: [PATCH] -If user specifies filename as an argument, don't override

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

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 723c890f0..959702903 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -266,7 +266,7 @@ sub addnode
                 $lstatements = 'option root-path \"'.$iscsirootpath.'\";'.$lstatements;
             }
         }
-        if ($nrent and $nrent->{netboot} and $nrent->{netboot} eq 'pxe') {
+        if ($nrent and $nrent->{netboot} and $nrent->{netboot} eq 'pxe' and $lstatements !~ /filename/) {
             if (-f "$tftpdir/xcat/xnba.kpxe") {
                 if ($doiscsi and $chainent and $chainent->{currstate} and ($chainent->{currstate} eq 'iscsiboot' or $chainent->{currstate} eq 'boot')) {
                     $lstatements = 'if exists gpxe.bus-id { filename = \"\"; } else if exists client-architecture { filename = \"xcat/xnba.kpxe\"; } '.$lstatements;