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

add check for myxcatpost file name

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13234 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott
2012-07-03 18:01:49 +00:00
parent fdb706b631
commit 331dc24373
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,43 +121,52 @@ sub myxCATname
# make sure xcatd is running - & db is available
# this routine is called during initial install of xCAT
my $cmd="lsxcatd -d > /dev/null 2>&1";
my $outref = [];
@$outref = `$cmd`;
my $rc = $? >> 8;
if ($rc == 0)
{
if (xCAT::Utils->isMN())
{
my $cmd="lsxcatd -d > /dev/null 2>&1";
my $outref = [];
@$outref = `$cmd`;
my $rc = $? >> 8;
if ($rc == 0)
{
if (xCAT::Utils->isMN())
{
# read the site table, master attrib
my $hostname = xCAT::Utils->get_site_Master();
if (($hostname =~ /\d+\.\d+\.\d+\.\d+/) || ($hostname =~ /:/))
{
$name = xCAT::NetworkUtils->gethostname($hostname);
$name = xCAT::NetworkUtils->gethostname($hostname);
}
else
{
$name = $hostname;
}
}
elsif (xCAT::Utils->isServiceNode())
{
# the myxcatpost_<nodename> file should exist on all nodes!
my $catcmd = "cat /xcatpost/myxcatpost_* | grep '^NODE='";
# - can't use runcmd because this routine is called by runcmd
my $output = `$catcmd`;
if ($::RUNCMD_RC == 0)
}
elsif (xCAT::Utils->isServiceNode())
{
my $filename;
# get any files with the format myxcatpost_*
my $lscmd = qq~/bin/ls /xcatpost/myxcatpost_* 2>/dev/null~;
my $output = `$lscmd`;
my $rc = $? >> 8;
if ($rc == 0)
{
($junk, $name) = split('=', $output);
foreach my $line ( split(/\n/, $output)) {
my ($junk, $hostname) = split('myxcatpost_', $line);
if (xCAT::InstUtils->is_me($hostname)) {
$filename="/xcatpost/myxcatpost_$hostname";
last;
}
}
if ( -e $filename ) {
my $catcmd = qq~/bin/cat $filename | grep '^NODE=' 2>/dev/null~;
my $string = `$catcmd`;
if ($rc == 0) {
($junk, $name) = split('=', $string);
}
}
}
}
}
}
}
if (!$name) {
$name = hostname();