Author: arkurth
Date: Wed Jun 29 22:18:56 2016
New Revision: 1750731
URL: http://svn.apache.org/viewvc?rev=1750731&view=rev
Log:
VCL-958
Removed call to set_vcld_post_load_status from Windows.pm. Added call to the
very end of the post_load subroutine in Version_5.pm and Version_6.pm.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm?rev=1750731&r1=1750730&r2=1750731&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm Wed Jun 29 22:18:56
2016
@@ -934,20 +934,12 @@ sub post_load {
$self->data->set_imagemeta_postoption('');
}
}
-
-=item *
-
- Add a line to currentimage.txt indicating post_load has run
-
-=cut
-
- $self->set_vcld_post_load_status();
=back
=cut
- notify($ERRORS{'OK'}, 0, "returning 1");
+ notify($ERRORS{'DEBUG'}, 0, "Windows common post-load tasks complete");
return 1;
} ## end sub post_load
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm?rev=1750731&r1=1750730&r2=1750731&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm Wed Jun 29
22:18:56 2016
@@ -176,13 +176,20 @@ sub post_load {
my $script_path = '$SYSTEMROOT/vcl_post_load.cmd';
if (!$self->file_exists($script_path)) {
notify($ERRORS{'DEBUG'}, 0, "custom post_load script does NOT
exist in image: $script_path");
- return 1;
}
else {
# Run the post_reserve script
$self->run_script($script_path);
}
+=item *
+
+ Add a line to currentimage.txt indicating post_load has run
+
+=cut
+
+ $self->set_vcld_post_load_status();
+
=back
=cut
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm?rev=1750731&r1=1750730&r2=1750731&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm Wed Jun 29
22:18:56 2016
@@ -289,13 +289,20 @@ sub post_load {
my $script_path = '$SYSTEMROOT/vcl_post_load.cmd';
if (!$self->file_exists($script_path)) {
notify($ERRORS{'DEBUG'}, 0, "custom post_load script does NOT
exist in image: $script_path");
- return 1;
}
else {
# Run the post_reserve script
$self->run_script($script_path);
}
+=item *
+
+ Add a line to currentimage.txt indicating post_load has run
+
+=cut
+
+ $self->set_vcld_post_load_status();
+
=back
=cut
