arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arp command location is different between redhat and debian/ubuntu

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16216 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005
2013-05-08 09:40:02 +00:00
parent cdb5b59df5
commit b13e95a70b
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/blade.pm
View File

@@ -4296,7 +4296,13 @@ sub process_request {
$invreq{command} = ['rinv'];
my $mac;
my $ip = $request->{'_xcat_clientip'};
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -e "/etc/debian_version" ) {
$arptable = `/usr/sbin/arp -n`;
}
else{
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {

8
xCAT-server/lib/xcat/plugins/hpblade.pm
View File

@@ -689,7 +689,13 @@ sub process_request {
$invreq{command} = ['rinv'];
my $mac;
my $ip = $request->{'_xcat_clientip'};
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -e "/etc/debian_version") {
$arptable = `/usr/sbin/arp -n`;
}
else{
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {

8
xCAT-server/lib/xcat/plugins/profilednodes.pm
View File

@@ -1437,7 +1437,13 @@ sub findme{
my $ip = $request->{'_xcat_clientip'};
xCAT::MsgUtils->message('S', "Profield nodes discover: _xcat_clientip is $ip.\n");
my $mac = '';
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -e "/etc/debian_version" ){
$arptable = `/usr/sbin/arp -n`;
}
else {
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {

8
xCAT-server/lib/xcat/plugins/seqdiscovery.pm
View File

@@ -71,7 +71,13 @@ sub findme {
if (defined $request->{nodetype} and $request->{nodetype}->[0] eq 'virtual') {
return;
}
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -e "/etc/debian_version") {
$arptable = `/usr/sbin/arp -n`;
}
else{
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {

8
xCAT-server/lib/xcat/plugins/switch.pm
View File

@@ -130,7 +130,13 @@ sub process_request {
#discovery working. Food for thought.
return;
}
my $arptable = `/sbin/arp -n`;
my $arptable;
if ( -e "/etc/debian_version") {
$arptable = `/usr/sbin/arp -n`;
}
else{
$arptable = `/sbin/arp -n`;
}
my @arpents = split /\n/,$arptable;
foreach (@arpents) {
if (m/^($ip)\s+\S+\s+(\S+)\s/) {