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

fix subroutine moving issue in xCAT-server/sbin/

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13503 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao 2012-08-14 11:48:59 +00:00
parent 2204106886
commit 14afeedb9e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/sbin/pcp_collect
View File

@ -10,6 +10,8 @@ use xCAT::NodeRange;
use Sys::Hostname;
use Socket;
use xCAT::Utils;
use xCAT::TableUtils;
use xCAT::NetworkUtils;
use xCAT::GlobalDef;
use xCAT_monitoring::monitorctrl;
use xCAT::MsgUtils;
@ -23,7 +25,7 @@ sub performance
my $noderef=xCAT_monitoring::monitorctrl->getMonHierarchy();
#identification of this node
my @hostinfo=xCAT::Utils->determinehostname();
my @hostinfo=xCAT::NetworkUtils->determinehostname();
#print "hosT:@hostinfo\n";
my $isSV=xCAT::Utils->isServiceNode();
#print "is sv is:$isSV \n";

3
xCAT-server/sbin/xcat_traphandler
View File

@ -8,6 +8,7 @@ use lib "$::XCATROOT/lib/perl";
use Sys::Syslog;
use xCAT::Table;
use xCAT::Utils;
use xCAT::TableUtils;
use xCAT::NetworkUtils;
use xCAT_plugin::ipmi;
use xCAT_monitoring::monitorctrl;
@ -333,7 +334,7 @@ if ($DB) {
};
my @a=();
push(@a, $event);
xCAT::Utils->logEventsToDatabase(\@a);
xCAT::TableUtils->logEventsToDatabase(\@a);
}
#run user defined commands if needed.

4
xCAT-server/sbin/xcatd
View File

@ -307,7 +307,7 @@ if ($inet6support) {
close($conn);
next;
}
my $tftpdir = xCAT::Utils->getTftpDir();
my $tftpdir = xCAT::TableUtils->getTftpDir();
eval {
alarm(2);
print $conn "ready\n";
@ -528,7 +528,7 @@ sleep 0.05;
$req->{'_xcat_clienthost'}=gethostbyaddr($client,AF_INET);
$req->{'_xcat_clientip'}=inet_ntoa($client);
$req->{'_xcat_clientport'}=$sport;
if (defined($cmd_handlers{"findme"}) and xCAT::Utils->nodeonmynet(inet_ntoa($client))) { #only discover from ips that appear to be on a managed network
if (defined($cmd_handlers{"findme"}) and xCAT::NetworkUtils->nodeonmynet(inet_ntoa($client))) { #only discover from ips that appear to be on a managed network
xCAT::MsgUtils->message("S","xcatd: Processing discovery request from ".$req->{'_xcat_clientip'});
$req->{cacheonly}->[0] = 1;
plugin_command($req,undef,\&build_response);