Removed the check of pping/ppping -i option when trying to remove the 'hfx' postfix in hostname, since in power 775 cluster, it is also possible to check ethernet connections with -i enx.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10929 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2011-10-31 10:59:01 +00:00
parent 9f7465c94b
commit 8dd5e11774
2 changed files with 5 additions and 14 deletions

View File

@ -119,11 +119,8 @@ foreach my $interf (@interfaces) {
# make a copy of the node list and add the interface on
$noderef = [ @nodes ];
foreach (@$noderef) {
if ($interf =~ /hf\d$/ && /-hf\d$/) {
s/-hf\d$/-$interf/;
} else {
s/$/-$interf/;
}
s/-hf\d$//;
s/$/-$interf/;
}
}
else {

View File

@ -36,15 +36,9 @@ fi
nodes=`echo $1 |sed "s/,/ /g"`
if [ -n "$ETH" ]; then
if echo $ETH | grep hf
then
nodes=`echo $nodes |sed "s/-hf[0-9]//g"`
nodes=`echo $nodes |sed "s/ /-$ETH /g"`
nodes="$nodes-$ETH"
else
nodes=`echo $nodes |sed "s/ /-$ETH /g"`
nodes="$nodes-$ETH"
fi
nodes=`echo $nodes |sed "s/-hf[0-9]//g"`
nodes=`echo $nodes |sed "s/ /-$ETH /g"`
nodes="$nodes-$ETH"
fi
which fping >/dev/null 2>&1