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

make sure xcatdb is running when db2sqlsetup is executed defect 3107948

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8161 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2010-11-15 13:26:24 +00:00
parent d37c29b4f4
commit 805e82dbda
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
xCAT-client/bin/db2sqlsetup
View File

@ -261,6 +261,8 @@ if (($::INIT) && ($::xcatrunningdb2 == 0))
if ($::SERVER)
{ # setting up server
# makesure the daemon is running
&startxcatd;
#
# Backup current database
#
@ -309,6 +311,7 @@ if (($::INIT) && ($::xcatrunningdb2 == 0))
{
xCAT::MsgUtils->message("E",
"Hostname resolution for $hname failed.");
&startxcatd;
exit(1);
}
} # end setting up SERVER
@ -389,17 +392,7 @@ if (($::INIT) && ($::xcatrunningdb2 == 0))
#
# start the daemon
#
my $xcmd;
if ($::osname eq 'AIX')
{
$xcmd = "$::XCATROOT/sbin/restartxcatd";
}
else
{
$xcmd = "service xcatd restart";
}
system($xcmd);
&startxcatd;
xCAT::MsgUtils->message("SI", "xCAT DB2 Client setup is complete.\n");
}
} # end initialization
@ -443,6 +436,31 @@ sub usage
xCAT::MsgUtils->message('I', "$msg");
}
#-----------------------------------------------------------------------------
=head3 startxcatd
start the daemon
=cut
#-----------------------------------------------------------------------------
sub startxcatd
{
my $xcmd;
if ($::osname eq 'AIX')
{
$xcmd = "$::XCATROOT/sbin/restartxcatd";
}
else
{
$xcmd = "service xcatd restart";
}
system($xcmd);
}
#-----------------------------------------------------------------------------
@ -1460,17 +1478,7 @@ sub restorexcatdb
#
# start the daemon
#
my $xcmd;
if ($::osname eq 'AIX')
{
$xcmd = "startsrc -s xcatd";
}
else
{
$xcmd = "service xcatd start";
}
system($xcmd);
&startxcatd;
}
#-----------------------------------------------------------------------------