xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #214 from bybai/pping

Browse Source 
fix issue pping cannot connect sqlsite under non-root user
This commit is contained in:
Xiaopeng Wang 2015-09-25 15:03:23 +08:00
commit e22d5f2bdf
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT-client/bin/pping
View File

@ -54,6 +54,8 @@ unless (@ARGV) {
}
my $noderange = $ARGV[0];
my @nodes=();
my $cmd="id -u";
my $userid = xCAT::Utils->runcmd("$cmd", -1);
if ($::NOEXPAND) { # this is when ppping is calling us and has already expanded the noderange
@nodes = split(/,/, $noderange);
@ -170,16 +172,23 @@ sub fping_pping {
}
sub nmap_pping {
my $nodes = shift;
my $nodes = shift;
my %deadnodes;
my @nmap_options;
my $more_options;
my $tcmd;
foreach (@$nodes) {
$deadnodes{$_}=1;
}
# get additional options from site table
my @nmap_options = xCAT::TableUtils->get_site_attribute("nmapoptions");
my $more_options = $nmap_options[0];
open (FPING, "nmap -PE --unprivileged --system-dns --send-ip -sP $more_options ".join(' ',@$nodes). " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
if ( $userid != 0 ) {
$tcmd ="tabdump site|grep nmapoptions|awk -F, '{print $2}'|sed -e 's/\"//g'|awk -F, '{print $1}'";
$more_options = xCAT::Utils->runcmd($tcmd, -1);
} else {
# get additional options from site table
@nmap_options = xCAT::TableUtils->get_site_attribute("nmapoptions");
$more_options = $nmap_options[0];
}
open (FPING, "nmap -PE --system-dns --send-ip -sP $more_options ".join(' ',@$nodes). " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
my $node;
while (<FPING>) {
if (/Host (.*) \(.*\) appears to be up/) {