From aa0f63c2b7492dd33e680c24cdbba64cc39af1f7 Mon Sep 17 00:00:00 2001
From: zhaoertao <ertaozh@cn.ibm.com>
Date: Thu, 30 Oct 2014 03:24:58 -0400
Subject: [PATCH] fix bug 4340:could not do diskless install on p8le vm

---
 xCAT-server/lib/xcat/plugins/debian.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 7318d415a..5d9d59a90 100755
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -1437,9 +1437,9 @@ sub mknetboot
         #}
         # append the mac address
         my $mac;
-        if( !$useifname && $machash->{$node}->[0] && $machash->{$node}->[0]->{'mac'}) {
+        if( $machash->{$node}->[0] && $machash->{$node}->[0]->{'mac'}) {
             # TODO: currently, only "mac" attribute with classic style is used, the "|" delimited string of "macaddress!hostname" format is not used
-            $mac = $machash->{$node}->[0]->{'mac'};
+            $mac = xCAT::Utils->parseMacTabEntry($machash->{$node}->[0]->{'mac'},$node);
 #            if ( (index($mac, "|") eq -1) and (index($mac, "!") eq -1) ) {
                #convert to linux format
                 if ($mac !~ /:/) {
@@ -1451,9 +1451,9 @@ sub mknetboot
 #            }
         }
 
-        #if ($useifname && $mac) {
-        #    $kcmdline .= "$mac ";
-        #}
+        if ($useifname && $mac) {
+            $kcmdline .= "$mac ";
+        }
 
         # add "netdev=<eth0>" or "BOOTIF=<mac>" 
         # which are used for other scenarios