Author: jfthomps
Date: Tue Jun 5 20:16:25 2012
New Revision: 1346568
URL: http://svn.apache.org/viewvc?rev=1346568&view=rev
Log:
VCL-576
Finalizing for 2.3 release
xCAT2.pm: modified load - added checks for different strings returned by
different tftp server used in latest version of xCAT when watching
/var/log/messages
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm?rev=1346568&r1=1346567&r2=1346568&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm Tue
Jun 5 20:16:25 2012
@@ -518,7 +518,8 @@ sub load {
}
}
if (!$s3) {
- if ($_ =~ /Serving pxelinux.0
to $computer_private_ip_address:/) {
+ if ($_ =~ /Serving pxelinux.0
to $computer_private_ip_address:/ ||
+ $_ =~ /RRQ from
$computer_private_ip_address filename pxelinux.0/) {
$s3 = 1;
chomp($_);
notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 3 set $_");
@@ -526,7 +527,8 @@ sub load {
}
}
if (!$s4) {
- if ($_ =~ /Serving xcat\/.+ to
$computer_private_ip_address:/) {
+ if ($_ =~ /Serving xcat\/.+ to
$computer_private_ip_address:/ ||
+ $_ =~ /RRQ from
$computer_private_ip_address filename xcat\/.+/) {
$s4 = 1;
chomp($_);
notify($ERRORS{'OK'},
0, "$computer_node_name STAGE 4 set $_");
