From f1a9fa4c7908b62bf6bd5e76c141ce43ce45ee41 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 20 Apr 2011 06:47:08 +0000
Subject: [PATCH] Removed --hfi for rnetboot command

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9352 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/FSPboot.pm |  7 ++-----
 perl-xCAT/xCAT/PPCboot.pm | 10 +++-------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/perl-xCAT/xCAT/FSPboot.pm b/perl-xCAT/xCAT/FSPboot.pm
index 29237fe0c..977268805 100644
--- a/perl-xCAT/xCAT/FSPboot.pm
+++ b/perl-xCAT/xCAT/FSPboot.pm
@@ -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 
     #####################################
diff --git a/perl-xCAT/xCAT/PPCboot.pm b/perl-xCAT/xCAT/PPCboot.pm
index b5651eed9..f2319477c 100644
--- a/perl-xCAT/xCAT/PPCboot.pm
+++ b/perl-xCAT/xCAT/PPCboot.pm
@@ -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
     #####################################