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

Fixed egrep bug.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11706 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2012-02-28 18:56:10 +00:00
parent 515507b45c
commit ffbc59f545
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3297,7 +3297,7 @@ sub nodeSet {
} elsif ($distro eq "rh") {
# Check kickstart template
if ( -e "$installDir/custom/install/rh/$tmpl" ) {
$out = `cat $installDir/custom/install/rh/$tmpl | egrep -i "--bootproto dhcp"`;
$out = `cat $installDir/custom/install/rh/$tmpl | egrep -ie "--bootproto dhcp"`;
if ($out =~ m/dhcp/i) {
$dhcp = 1;
}
@@ -3388,7 +3388,7 @@ sub nodeSet {
last;
} else {
# Go to next network available
$hcpNetName = ''
$hcpNetName = '';
}
}
} # End of foreach
@@ -3409,7 +3409,7 @@ sub nodeSet {
return;
}
xCAT::zvmUtils->printLn( $callback, "$node: Setting up networking on $hcpNetName (layer $layer)" );
xCAT::zvmUtils->printLn( $callback, "$node: Setting up networking on $hcpNetName (layer:$layer | DHCP:$dhcp)" );
# Generate read, write, and data channels
my $readChannel = "0.0." . ( sprintf('%X', $channel + 0) );