From 83b670e64783ddb8eef4dde77a74acabc8517e4b Mon Sep 17 00:00:00 2001 From: jjhua Date: Fri, 29 Oct 2010 09:22:09 +0000 Subject: [PATCH] remove the consoleondemand related code in FSPmac.pm. In scaling test, set consoleondemand=yes in site table for conserver. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7968 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPmac.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/perl-xCAT/xCAT/FSPmac.pm b/perl-xCAT/xCAT/FSPmac.pm index ced4f1a87..1dc3c49ea 100644 --- a/perl-xCAT/xCAT/FSPmac.pm +++ b/perl-xCAT/xCAT/FSPmac.pm @@ -446,23 +446,23 @@ sub getmacs { # return( [[$node,"Node not found, lparid=$lparid",RC_ERROR]] ); # } my $Rc; - my $sitetab = xCAT::Table->new('site'); - my $vcon = $sitetab->getAttribs({key => "conserverondemand"}, 'value'); - if ($vcon and $vcon->{"value"} and $vcon->{"value"} eq "yes" ) { + #my $sitetab = xCAT::Table->new('site'); + #my $vcon = $sitetab->getAttribs({key => "conserverondemand"}, 'value'); + #if ($vcon and $vcon->{"value"} and $vcon->{"value"} eq "yes" ) { # $result = xCAT::PPCcli::lpar_netboot( # $exp, # $request->{verbose}, # $name, # $d, # $opt ); - return( [[$node,"Not support conserverondemand's value is yes",RC_ERROR]] ); - } else { + # return( [[$node,"Not support conserverondemand's value is yes",RC_ERROR]] ); + #} else { ######################################### # Manually collect MAC addresses. ######################################### $result = do_getmacs( $request, $d, $exp, $name, $node ); - } - $sitetab->close; + #} + #$sitetab->close; $Rc = shift(@$result); my $data;