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
This commit is contained in:
xq2005 2013-05-09 01:48:59 +00:00
parent a2deab209f
commit a8d2c285e0
5 changed files with 5 additions and 36 deletions

View File

@ -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/) {

View File

@ -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/) {

View File

@ -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/) {

View File

@ -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/) {

View File

@ -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/) {