From ce581e6767f8335d928159de31348305c3d5136e Mon Sep 17 00:00:00 2001 From: immarvin Date: Mon, 12 Nov 2012 02:16:08 +0000 Subject: [PATCH] corrected some syntax git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14303 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index f05d853d0..55bd7405d 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -647,7 +647,7 @@ sub mknetboot # append the mac address my $mac; - if( $usemac || $useifname && $machash->{$node}->[0] && $machash->{$node}->[0]->{'mac'}) { + if( ($usemac || $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) ) { @@ -677,7 +677,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 ( $usemac || $useifname && $mac) { + if ( ($usemac || $useifname) && $mac) { $kcmdline .= "BOOTIF=" . $mac . " "; } }