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

fix Service Node install

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@630 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2008-02-29 14:06:01 +00:00
parent bed4fe8630
commit a91461d715
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
perl-xCAT-2.0/xCAT/Utils.pm
View File

@ -1403,6 +1403,12 @@ sub isServiceReq
}
# Need to obtain all ip addresses for service node to check
# before we do the below logic
$rc = xCAT::Utils->exportDBConfig(); # export DB env
if ($rc != 0) {
xCAT::MsgUtils->message('S', "Unable export DB environment.\n");
return -1;
}
# have this service setup
if (($service eq "dhcpserver") || ($service eq "nameservers"))
@ -1503,7 +1509,9 @@ sub determinehostname
$hostname = $thostname[0];
my ($hcp, $aliases, $addtype, $length, @addrs) = gethostbyname($hostname);
my $ipaddress = inet_ntoa($addrs[0]);
my @hostinfo = ($hostname, $ipaddress);
# strip off domain, if there
my @shorthost=split(/\./,$hostname);
my @hostinfo = ($shorthost[0], $ipaddress);
return @hostinfo;
}

2
xCAT-server-2.0/lib/xcat/plugins/NFSsn.pm
View File

@ -182,7 +182,7 @@ sub setup_NFS
{
my ($file_sys, $blocks, $used, $avail, $cap, $mount_point) =
split(' ', $line);
if ($mount_point == $directory)
if ($mount_point eq $directory)
{
$found = 1;
last;

3
xCAT-server-2.0/xCAT-server.spec
View File

@ -32,6 +32,7 @@ xCAT-server provides the core server and configuration management components of
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{prefix}/sbin
mkdir -p $RPM_BUILD_ROOT/%{prefix}/rc.d
mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/install
mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot
mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/ca
@ -52,6 +53,8 @@ cp -hpR share/xcat/netboot/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/
cp -d sbin/* $RPM_BUILD_ROOT/%{prefix}/sbin
chmod 755 $RPM_BUILD_ROOT/%{prefix}/sbin/*
cp rc.d/* $RPM_BUILD_ROOT/%{prefix}/rc.d
chmod 755 $RPM_BUILD_ROOT/%{prefix}/rc.d/*
cp share/xcat/ca/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/ca
chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/xcat/ca/*