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

fix defect 3187839

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8911 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2011-02-23 14:49:16 +00:00
parent 24dcf5717c
commit 3676e5b339
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
perl-xCAT/xCAT/InstUtils.pm
View File

@ -122,11 +122,16 @@ sub myxCATname
# make sure xcatd is running - & db is available
# this routine is called during initial install of xCAT
my $rc = `lsxcatd -d`;
if ($rc == 0) {
my $cmd="lsxcatd -d > /dev/null 2>&1";
my $outref = [];
@$outref = `$cmd`;
my $rc = $? >> 8;
if (xCAT::Utils->isMN())
{
if ($rc == 0)
{
if (xCAT::Utils->isMN())
{
# read the site table, master attrib
my $hostname = xCAT::Utils->get_site_Master();
@ -139,9 +144,9 @@ sub myxCATname
$name = $hostname;
}
}
elsif (xCAT::Utils->isServiceNode())
{
}
elsif (xCAT::Utils->isServiceNode())
{
# the myxcatpost_<nodename> file should exist on all nodes!
my $catcmd = "cat /xcatpost/myxcatpost_* | grep '^NODE='";
@ -152,8 +157,8 @@ sub myxCATname
{
($junk, $name) = split('=', $output);
}
}
}
}
}
if (!$name) {
$name = hostname();