From 255811ee1f5c13a6f515d8ae2184113141d73f4a Mon Sep 17 00:00:00 2001
From: zhaoertao <ertaozh@cn.ibm.com>
Date: Sat, 18 Oct 2014 17:13:02 -0700
Subject: [PATCH] fix bugs that no BOOTIF set for ubuntu diskless

---
 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 750b8d840..74d7849a5 100755
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -1435,7 +1435,7 @@ sub mknetboot
         #}
         # append the mac address
         my $mac;
-        if( $useifname && $machash->{$node}->[0] && $machash->{$node}->[0]->{'mac'}) {
+        if( !$useifname && $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'};
 #            if ( (index($mac, "|") eq -1) and (index($mac, "!") eq -1) ) {
@@ -1449,9 +1449,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
@@ -1463,7 +1463,7 @@ sub mknetboot
         } elsif ( $reshash->{$node}->[0] and $reshash->{$node}->[0]->{primarynic} and $reshash->{$node}->[0]->{primarynic} ne "mac") {
             $kcmdline .= "netdev=" . $reshash->{$node}->[0]->{primarynic} . " ";
         } else {
-            if ( $useifname && $mac) {
+            if ( !$useifname && $mac) {
                 $kcmdline .= "BOOTIF=" . $mac . " ";
             }
         }