From a8d2c285e08ab2e9f329fd7997c7baf4148f12de Mon Sep 17 00:00:00 2001
From: xq2005 <xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 9 May 2013 01:48:59 +0000
Subject: [PATCH] roolback for 2.8.1 tag

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16227 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/blade.pm         | 8 +-------
 xCAT-server/lib/xcat/plugins/hpblade.pm       | 8 +-------
 xCAT-server/lib/xcat/plugins/profilednodes.pm | 9 +--------
 xCAT-server/lib/xcat/plugins/seqdiscovery.pm  | 8 +-------
 xCAT-server/lib/xcat/plugins/switch.pm        | 8 +-------
 5 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index bed6954e9..1c0fa396c 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -4296,13 +4296,7 @@ sub process_request {
     $invreq{command} = ['rinv'];
     my $mac;
     my $ip = $request->{'_xcat_clientip'};
-    my $arptable;
-    if ( -e "/etc/debian_version" ) {
-        $arptable = `/usr/sbin/arp -n`;
-    }
-    else{
-        $arptable = `/sbin/arp -n`;
-    }
+    my $arptable = `/sbin/arp -n`;
     my @arpents = split /\n/,$arptable;
     foreach  (@arpents) {
       if (m/^($ip)\s+\S+\s+(\S+)\s/) {
diff --git a/xCAT-server/lib/xcat/plugins/hpblade.pm b/xCAT-server/lib/xcat/plugins/hpblade.pm
index 7a701ab78..2f7b2c7e5 100755
--- a/xCAT-server/lib/xcat/plugins/hpblade.pm
+++ b/xCAT-server/lib/xcat/plugins/hpblade.pm
@@ -689,13 +689,7 @@ sub process_request {
 		$invreq{command} = ['rinv'];
 		my $mac;
 		my $ip = $request->{'_xcat_clientip'};
-		my $arptable;
-                if ( -e "/etc/debian_version") {
-                    $arptable = `/usr/sbin/arp -n`;
-                }
-                else{
-                    $arptable = `/sbin/arp -n`;
-                }
+		my $arptable = `/sbin/arp -n`;
 		my @arpents = split /\n/,$arptable;
 		foreach  (@arpents) {
 			if (m/^($ip)\s+\S+\s+(\S+)\s/) {
diff --git a/xCAT-server/lib/xcat/plugins/profilednodes.pm b/xCAT-server/lib/xcat/plugins/profilednodes.pm
index 819046ee3..da8fc7313 100644
--- a/xCAT-server/lib/xcat/plugins/profilednodes.pm
+++ b/xCAT-server/lib/xcat/plugins/profilednodes.pm
@@ -37,7 +37,6 @@ my %allnicips;
 my %allracks;
 my %allchassis;
 my %allswitches;
-
 # The array of all chassis which is special CMM 
 my %allcmmchassis;
 my %allothernics;
@@ -1437,13 +1436,7 @@ sub findme{
     my $ip = $request->{'_xcat_clientip'};
     xCAT::MsgUtils->message('S', "Profield nodes discover: _xcat_clientip is $ip.\n");
     my $mac = '';
-    my $arptable;
-    if ( -e "/etc/debian_version" ){
-        $arptable = `/usr/sbin/arp -n`;
-    }
-    else {
-        $arptable = `/sbin/arp -n`;
-    }
+    my $arptable = `/sbin/arp -n`;
     my @arpents = split /\n/,$arptable;
     foreach  (@arpents) {
         if (m/^($ip)\s+\S+\s+(\S+)\s/) {
diff --git a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
index 4e272b91f..08052a707 100644
--- a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
@@ -71,13 +71,7 @@ sub findme {
     if (defined $request->{nodetype} and $request->{nodetype}->[0] eq 'virtual') {
         return;
     }
-    my $arptable;
-    if ( -e "/etc/debian_version") {
-        $arptable = `/usr/sbin/arp -n`;
-    }
-    else{ 
-        $arptable = `/sbin/arp -n`;
-    }
+    my $arptable = `/sbin/arp -n`;
     my @arpents = split /\n/,$arptable;
     foreach  (@arpents) {
         if (m/^($ip)\s+\S+\s+(\S+)\s/) {
diff --git a/xCAT-server/lib/xcat/plugins/switch.pm b/xCAT-server/lib/xcat/plugins/switch.pm
index 9deda931a..3ae9ef45d 100644
--- a/xCAT-server/lib/xcat/plugins/switch.pm
+++ b/xCAT-server/lib/xcat/plugins/switch.pm
@@ -130,13 +130,7 @@ sub process_request {
 	    #discovery working.  Food for thought.
 	    return;
 	}
-	my $arptable;
-        if ( -e "/etc/debian_version") {
-            $arptable = `/usr/sbin/arp -n`;
-        }
-        else{
-            $arptable = `/sbin/arp -n`;
-        }
+	my $arptable = `/sbin/arp -n`;
 	my @arpents = split /\n/,$arptable;
 	foreach  (@arpents) {
 	    if (m/^($ip)\s+\S+\s+(\S+)\s/) {