fixed Client.pm to handle user-specified xcatprefix directory in XCATBYPASS mode
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@122 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
3ff15de823
commit
f7f1f7dee8
@ -3,6 +3,7 @@
|
||||
package xCAT::Client;
|
||||
use xCAT::NodeRange;
|
||||
use xCAT::Utils;
|
||||
use xCAT::Table;
|
||||
|
||||
use IO::Socket::SSL;
|
||||
if (xCAT::Utils->isLinux()) {
|
||||
@ -19,7 +20,7 @@ use XML::Simple;
|
||||
use Data::Dumper;
|
||||
use Storable qw(dclone);
|
||||
my $xcathost='localhost:3001';
|
||||
my $plugins_dir='/usr/lib/xcat/plugins';
|
||||
my $plugins_dir;
|
||||
my %resps;
|
||||
1;
|
||||
|
||||
@ -61,6 +62,7 @@ sub submit_request {
|
||||
my $request = shift;
|
||||
my $callback = shift;
|
||||
|
||||
|
||||
# If XCATBYPASS is set, invoke the plugin process_request method directly
|
||||
# without going through the socket connection to the xcatd daemon
|
||||
if ($ENV{XCATBYPASS}) {
|
||||
@ -73,6 +75,17 @@ sub submit_request {
|
||||
scan_plugins();
|
||||
}
|
||||
} else {
|
||||
# figure out default plugins dir
|
||||
my $sitetab=xCAT::Table->new('site');
|
||||
unless ($sitetab) {
|
||||
print ("ERROR: Unable to open basic site table for configuration\n");
|
||||
}
|
||||
$::XCATPREFIX = '/usr';
|
||||
my ($tmp) = $sitetab->getAttribs({'key'=>'xcatprefix'},'value');
|
||||
if ($tmp and $tmp->{value}) {
|
||||
$::XCATPREFIX = $tmp->{value};
|
||||
}
|
||||
$plugins_dir=$::XCATPREFIX.'/lib/xcat/plugins';
|
||||
scan_plugins();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user