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

Check network layer before setting MAC address.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11327 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2012-01-04 02:29:36 +00:00
parent 5040aa6a71
commit e1e99c5489
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2910,6 +2910,9 @@ EOM"`;
$out = `ssh $hcp sed --in-place -e "s/$sourceNode/$tgtNode/g" \ -e "s/$sourceIp/$targetIp/i" $cloneMntPt/etc/hosts`;
$out = `ssh $hcp sed --in-place -e "s/$sourceIp/$targetIp/i" \ -e "s/$sourceNode/$tgtNode/g" $ifcfgPath`;
# Get network layer
my $layer = xCAT::zvmCPUtils->getNetworkLayer( $hcp, $hcpNetName );
# Set MAC address
my $networkFile = $tgtNode . "NetworkConfig";
if ( $srcOs =~ m/Red Hat/i ) {
@@ -2922,16 +2925,19 @@ EOM"`;
# SUSE only
$out = `ssh $hcp "cat $ifcfgPath" | grep -v "LLADDR" | grep -v "UNIQUE" > /tmp/$networkFile`;
$out = `echo "LLADDR='$targetMac'" >> /tmp/$networkFile`;
$out = `echo "UNIQUE=''" >> /tmp/$networkFile`;
# Set to MAC address (only for layer 2)
if ( $layer == 2 ) {
$out = `echo "LLADDR='$targetMac'" >> /tmp/$networkFile`;
$out = `echo "UNIQUE=''" >> /tmp/$networkFile`;
}
}
xCAT::zvmUtils->sendFile( $hcp, "/tmp/$networkFile", $ifcfgPath );
# Remove network file from /tmp
$out = `rm /tmp/$networkFile`;
# Set to hardware configuration (Only for layer 2)
my $layer = xCAT::zvmCPUtils->getNetworkLayer( $hcp, $hcpNetName );
# Set to hardware configuration (only for layer 2)
if ( $layer == 2 ) {
#*** Red Hat ***