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

fix Socket6 error on AIX funny line added to every command addr xxx .....

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3476 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2009-06-01 20:39:29 +00:00
parent 35c7e5dbe4
commit 486e28c82d
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
perl-xCAT/xCAT/Client.pm
View File

@ -8,6 +8,9 @@ BEGIN
my $inet6support;
$inet6support=eval { require Socket6 };
if ($^O =~ /^aix/i) {
$inet6support = 0;
}
if ($inet6support) {
$inet6support = eval { require IO::Socket::INET6 };
}

7
xCAT-rmc/resources/node/IBM.Sensor/ErrorLogSensor.pm
View File

@ -1,12 +1,7 @@
#!/usr/bin/perl
BEGIN
{
$::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
}
$RES::Sensor{'ErrorLogSensor'} = {
Name => q(ErrorLogSensor),
Command => "$::XCATROOT/sbin/rmcmon/monerrorlog",
Command => "/etc/xcat/rmcmon/scripts/monerrorlog",
UserName => q(root),
RefreshInterval => q(60),
ControlFlags => q(4),

15
xCAT-rmc/xCAT-rmc.spec
View File

@ -33,6 +33,8 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/rmc
mkdir -p $RPM_BUILD_ROOT/%{prefix}/sbin/rmcmon
mkdir -p $RPM_BUILD_ROOT/install/postscripts
mkdir -p $RPM_BUILD_ROOT/install/post/xcat/rmcmon/resources
mkdir -p $RPM_BUILD_ROOT/install/post/xcat/rmcmon/scripts
cp plugin/* $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring
cp -r resources $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_monitoring/rmc
@ -43,6 +45,18 @@ chmod 755 $RPM_BUILD_ROOT/%{prefix}/sbin/rmcmon/*
cp scripts/configrmcnode $RPM_BUILD_ROOT/install/postscripts
chmod 755 $RPM_BUILD_ROOT/install/postscripts/configrmcnode
FILES_TO_COPY=`cat scripts/scripts_to_node|tr '\n' ' '`
echo "files=$FILES_TO_COPY"
for file in $FILES_TO_COPY
do
echo "file=$file"
cp scripts/$file $RPM_BUILD_ROOT/install/post/xcat/rmcmon/scripts
done
chmod 755 $RPM_BUILD_ROOT/install/post/xcat/rmcmon/scripts/*
cp -r resources/node/* $RPM_BUILD_ROOT/install/post/xcat/rmcmon/resources
%clean
rm -rf $RPM_BUILD_ROOT
@ -52,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root)
%{prefix}
/install/postscripts
/install/post/xcat/rmcmon
%changelog

3
xCAT-server/sbin/xcatd
View File

@ -32,6 +32,9 @@ my $plugin_numchildren=0;
my %plugin_children;
my $inet6support;
$inet6support=eval { require Socket6 };
if ($^O =~ /^aix/i) {
$inet6support = 0;
}
if ($inet6support) {
$inet6support = eval { require IO::Socket::INET6 };
}