xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 19:02:27 +00:00
Code Issues Releases Wiki Activity

fix defect 3145930 mysqlsetup retoring when no dump taken

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8532 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2010-12-30 12:25:27 +00:00
parent 40dac5e550
commit 4091399a58
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
xCAT-client/bin/mysqlsetup
View File

@@ -337,20 +337,20 @@ if ($::INIT)
# create cfgloc file
#
&createcfgloc;
#
# Restore backed up database into MySQL
#
&restorexcatdb;
if ($::osname eq 'AIX')
{
xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.\nYou should log out and back in, so that the new ulimit settings will take affect.");
} else {
xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.");
}
}
#
# Restore backed up database into MySQL
#
&restorexcatdb;
if ($::osname eq 'AIX')
{
xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.\nYou should log out and back in, so that the new ulimit settings will take affect.");
} else {
xCAT::MsgUtils->message("I", "xCAT is now running on the MySQL database.");
}
} # end initialization
if ($::SETUPODBC)
@@ -1584,7 +1584,6 @@ sub createcfgloc
}
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
@@ -1602,28 +1601,25 @@ sub restorexcatdb
# copy the mysql cfgloc file
my $cmd;
if ($::xcatrunningmysql == 0)
{ # xcat cfgloc not configured
# if they had an old cfgloc on another database, save it
if ((-e ("/etc/xcat/cfgloc")) && (!(-e ("/etc/xcat/cfgloc.olddb"))))
{
# if they had an old cfgloc on another database, save it
if ((-e ("/etc/xcat/cfgloc")) && (!(-e ("/etc/xcat/cfgloc.olddb"))))
{
$cmd = "cp /etc/xcat/cfgloc /etc/xcat/cfgloc.olddb";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message("E", " $cmd failed.");
}
}
}
# put in place cfgloc for mysql
$cmd = "cp /etc/xcat/cfgloc.mysql /etc/xcat/cfgloc";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
# put in place cfgloc for mysql
$cmd = "cp /etc/xcat/cfgloc.mysql /etc/xcat/cfgloc";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message("E", " $cmd failed.");
exit(1);
}
}
# allow readonly by root