arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug 4340:could not do diskless install on p8le vm

Browse Source
This commit is contained in:
zhaoertao 2014-10-30 03:24:58 -04:00
parent f101f97df4
commit aa0f63c2b7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/lib/xcat/plugins/debian.pm
View File

@ -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