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

fix defect 3145930

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8534 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2010-12-30 12:41:39 +00:00
parent 4091399a58
commit 5292ab865a
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
xCAT-client/bin/pgsqlsetup
View File

@ -288,15 +288,15 @@ if (($::INIT) && ($::xcatrunningpgsql == 0))
# create cfgloc file
#
&createcfgloc;
#
# Restore backed up database into PostgreSQL
#
&restorexcatdb;
}
#
# Restore backed up database into PostgreSQL
#
&restorexcatdb;
xCAT::MsgUtils->message("I",
"xCAT is now running on the PostgreSQL database.\n");
"xCAT is running on the PostgreSQL database.\n");
} # end initialization
@ -383,18 +383,13 @@ sub backupxcatdb
{
# If there is no backup or the /etc/xcat/cfgloc file does not point to
# pgsql, then we backup the database
my $sitefile = "$::backupdir/site.csv";
if ((!(-e $sitefile)) || ($::xcatrunningpgsql == 0))
{
xCAT::MsgUtils->message(
xCAT::MsgUtils->message(
"I",
"Backing up xCAT Database to $::backupdir.\nThis could take several minutes."
);
if (!(-e $::backupdir))
{ # does not exist, make it
if (!(-e $::backupdir))
{ # does not exist, make it
my $cmd = "mkdir -p $::backupdir";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
@ -402,9 +397,9 @@ sub backupxcatdb
xCAT::MsgUtils->message("E", " $cmd failed.");
exit(1);
}
}
else
{ # remove contents
}
else
{ # remove contents
my $cmd = "rm -f $::backupdir/*";
xCAT::Utils->runcmd($cmd, 0);
@ -413,16 +408,15 @@ sub backupxcatdb
xCAT::MsgUtils->message("E", " $cmd failed.");
exit(1);
}
}
}
# back it up
my $cmd = " dumpxCATdb -p $::backupdir";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
# back it up
my $cmd = " dumpxCATdb -p $::backupdir";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message("E", " $cmd failed.");
exit(1);
}
}
}