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

Set userID to be consistent across user directory entry.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11397 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2012-01-21 13:53:46 +00:00
parent ffb980d21b
commit ad911d6bb5
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-server/lib/xcat/plugins/zvm.pm
View File

@ -1786,6 +1786,10 @@ sub makeVM {
my $out;
my $target = "root@" . $hcp;
if ($userEntry) {
# Copy user entry
$out = `cp $userEntry /tmp/$node.txt`;
$userEntry = "/tmp/$node.txt";
# Get MAC address in 'mac' table
my $macId;
@ -1816,6 +1820,7 @@ sub makeVM {
$out = `cat $userEntry | egrep -i "NICDEF"`;
my @lines;
my @words;
my $line;
if ($out) {
# Get the network used by the HCP
@ -1823,7 +1828,7 @@ sub makeVM {
@lines = split( '\n', $out );
# There should only be one network
my $line = xCAT::zvmUtils->trimStr( $lines[0] );
$line = xCAT::zvmUtils->trimStr( $lines[0] );
@words = split( ' ', $line );
my $netName = $words[4];
@ -1835,9 +1840,24 @@ sub makeVM {
# Append MACID at the end
$out = `sed --in-place -e "s,$oldNicDef,$nicDef,i" $userEntry`;
}
# Open user entry
$out = `cat $userEntry`;
@lines = split( '\n', $out );
# Get the userID in user entry
$line = xCAT::zvmUtils->trimStr( $lines[0] );
@words = split( ' ', $line );
my $id = $words[1];
# Change userID in user entry to match userID defined in xCAT
$out = `sed --in-place -e "s,$id,$userId,i" $userEntry`;
# SCP file over to HCP
$out = `scp $userEntry $target:$userEntry`;
# Remove user entry
$out = `rm $userEntry`;
# Create virtual server
$out = `ssh $hcp "$::DIR/createvs $userId $userEntry"`;