xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 19:32:31 +00:00
Code Issues Releases Wiki Activity

Removed --hfi for rnetboot command

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9352 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz
2011-04-20 06:47:08 +00:00
parent bfa95c588a
commit f1a9fa4c79
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
perl-xCAT/xCAT/FSPboot.pm
View File

@@ -105,7 +105,8 @@ sub do_rnetboot {
$cmd.= " -o";
}
if ( exists( $opt->{hfi} )) {
my %client_nethash = xCAT::DBobjUtils->getNetwkInfo( [$node] );
if ( grep /hf/, $client_nethash{$node}{mgtifname} ) {
$cmd.= " -t hfi-ent";
} else {
$cmd.= " -t ent";
@@ -218,10 +219,6 @@ sub rnetboot {
$opt{o} = $options->{o};
}
if ( exists( $options->{hfi} )) {
$opt{hfi} = 1;
}
#####################################
# Invalid target hardware
#####################################

10
perl-xCAT/xCAT/PPCboot.pm
View File

@@ -43,7 +43,7 @@ sub parse_args {
$Getopt::Long::ignorecase = 0;
Getopt::Long::Configure( "bundling" );
if ( !GetOptions( \%opt, qw(h|help V|Verbose v|version I|iscsiboot F f hfi o s=s m:s@ r=s t=s) )) {
if ( !GetOptions( \%opt, qw(h|help V|Verbose v|version I|iscsiboot F f o s=s m:s@ r=s t=s) )) {
return( usage() );
}
@@ -244,7 +244,8 @@ sub do_rnetboot {
}
}
if ( exists( $opt->{hfi} )) {
my %client_nethash = xCAT::DBobjUtils->getNetwkInfo( [$node] );
if ( grep /hf/, $client_nethash{$node}{mgtifname} ) {
$cmd.= " -t hfi-ent";
} else {
$cmd.= " -t ent";
@@ -361,11 +362,6 @@ sub rnetboot {
$opt{o} = $options->{o};
}
if ( exists( $options->{hfi} )) {
$opt{hfi} = 1;
}
#####################################
# Do iscsi boot
#####################################