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

fix for defect 3232260

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9118 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2011-03-21 17:46:12 +00:00
parent b0369a94f4
commit 1275bbbce3
1 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
xCAT-client/bin/db2sqlsetup
View File

@ -114,7 +114,6 @@ if ($::VERSION)
}
#
# Get OS
#
@ -609,28 +608,45 @@ sub mkdb2user
#
my $cmd;
my $makeuser;
if ($::osname eq 'AIX')
{
$cmd = "lsgroup xcatdb";
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0)
{
#group does not exist, need to make it
$cmd = "mkgroup xcatdb";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message("SE", " $cmd failed.");
exit(1);
}
}
$cmd = "lsuser xcatdb";
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0)
{
$makeuser =1; # user does not exist
} else { # user exists but check to see if home directory exist
my $homedir = xCAT::Utils->getHomeDir("xcatdb");
if (!(-e $homedir)) { # if it does not exist
$cmd = "rmuser xcatdb"; # we need to remake the user
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message("SE", " $cmd failed.");
exit(1);
}
$makeuser =1;
} else { # user ok , home dir ok
$makeuser =0;
}
}
if ($makeuser ==1) {
$cmd = "lsgroup xcatdb";
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0)
{
#user does not exist, need to make it
#group does not exist, need to make it
$cmd = "mkgroup xcatdb";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message("SE", " $cmd failed.");
exit(1);
}
}
$cmd = "mkuser pgrp=xcatdb home=$::databaseloc shell=/bin/ksh xcatdb";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
@ -669,10 +685,32 @@ sub mkdb2user
else
{ # Linux
$cmd = "egrep -i \"^xcatdb:\" /etc/group";
$cmd = "egrep -i \"^xcatdb:\" /etc/passwd";
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0)
{
$makeuser =1; # user does not exist
} else { # user exists but check to see if home directory exist
my $homedir = xCAT::Utils->getHomeDir("xcatdb");
if (!(-e $homedir)) { # if it does not exist
$cmd = "userdel xcatdb"; # we need to remake the user
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message("SE", " $cmd failed.");
exit(1);
}
$makeuser =1; # user does not exist
} else { # user ok , home dir ok
$makeuser =0;
}
}
if ($makeuser ==1) {
$cmd = "egrep -i \"^xcatdb:\" /etc/group";
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0)
{
#group does not exist, need to make it
$cmd = "groupadd xcatdb";
@ -682,13 +720,9 @@ sub mkdb2user
xCAT::MsgUtils->message("SE", " $cmd failed.");
exit(1);
}
}
$cmd = "egrep -i \"^xcatdb:\" /etc/passwd";
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0)
{
}
#user does not exist, need to make it
#user does not exist, need to make it
$cmd = "useradd -d $::databaseloc -g xcatdb -m -s /bin/bash xcatdb";
xCAT::Utils->runcmd($cmd, 0);
if ($::RUNCMD_RC != 0)
@ -709,6 +743,7 @@ sub mkdb2user
exit(1);
}
}
}
#-----------------------------------------------------------------------------