Author: arkurth
Date: Thu Jul 23 18:37:40 2015
New Revision: 1692426
URL: http://svn.apache.org/r1692426
Log:
VCL-889
Added call to execute vcl_post_load.cmd in post_load subroutine in Version_5.pm
and Version_6.pm.
Other
Fixed POD comments in a few places where numbered lists are used. The syntax
was incorrect.
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
vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm
vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.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=1692426&r1=1692425&r2=1692426&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm Thu Jul 23 18:37:40
2015
@@ -274,7 +274,7 @@ sub pre_capture {
notify($ERRORS{'OK'}, 0, "beginning Windows image capture preparation
tasks on $computer_node_name");
-=item 1
+=item *
Disable RDP access from any IP address
@@ -656,7 +656,7 @@ sub post_load {
notify($ERRORS{'OK'}, 0, "beginning Windows post-load tasks on
$computer_node_name");
-=item 1
+=item *
Wait for computer to respond to SSH
@@ -1006,29 +1006,18 @@ sub post_reserve {
return 0;
}
- my $image_name = $self->data->get_image_name();
- my $computer_short_name = $self->data->get_computer_short_name();
-
# Run custom post_reserve scripts residing on the management node
$self->run_management_node_tools_scripts('post_reserve');
- # Check if script exists in the image
+ # Check if custom post_reserve script exists in the image
my $script_path = '$SYSTEMROOT/vcl_post_reserve.cmd';
if (!$self->file_exists($script_path)) {
- notify($ERRORS{'DEBUG'}, 0, "post_reserve script does NOT
exist: $script_path");
+ notify($ERRORS{'DEBUG'}, 0, "custom post_reserve script does
NOT exist in image: $script_path");
return 1;
}
-
- # Run the vcl_post_reserve.cmd script if it exists in the image
- my $result = $self->run_script($script_path);
- if (!defined($result)) {
- notify($ERRORS{'WARNING'}, 0, "failed to run post_reserve
script: $script_path");
- }
- elsif ($result == 0) {
- notify($ERRORS{'DEBUG'}, 0, "$script_path does not exist in
image: $image_name");
- }
else {
- notify($ERRORS{'DEBUG'}, 0, "ran $script_path");
+ # Run the post_reserve script
+ $self->run_script($script_path);
}
return 1;
@@ -1055,22 +1044,15 @@ sub post_reservation {
# Run custom post_reservation scripts residing on the management node
$self->run_management_node_tools_scripts('post_reservation');
+ # Check if custom post_reservation script exists in image
my $script_path = '$SYSTEMROOT/vcl_post_reservation.cmd';
-
- # Check if script exists
if (!$self->file_exists($script_path)) {
- notify($ERRORS{'DEBUG'}, 0, "post_reservation script does NOT
exist: $script_path");
+ notify($ERRORS{'DEBUG'}, 0, "custom post_reservation script
does NOT exist in image: $script_path");
return 1;
}
- # Run the vcl_post_reserve.cmd script if it exists in the image
- my $result = $self->run_script($script_path);
- if (!$result) {
- notify($ERRORS{'WARNING'}, 0, "failed to execute
post_reservation script: $script_path");
- }
- else {
- notify($ERRORS{'DEBUG'}, 0, "executed $script_path");
- }
+ # Run the post_reservation script
+ $self->run_script($script_path);
return 1;
}
@@ -8208,6 +8190,7 @@ EOF
notify($ERRORS{'WARNING'}, 0, "failed to set the registry key
to disable automatic updates");
return 0;
}
+
return 1;
}
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=1692426&r1=1692425&r2=1692426&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 Thu Jul 23
18:37:40 2015
@@ -22,10 +22,6 @@
VCL::Module::OS::Windows::Version_5.pm - VCL module to support Windows 5.x
operating systems
-=head1 SYNOPSIS
-
- Needs to be written
-
=head1 DESCRIPTION
This module provides VCL support for Windows version 5.x operating systems.
@@ -154,9 +150,7 @@ sub post_load {
notify($ERRORS{'DEBUG'}, 0, "beginning Windows version 5.x post-load
tasks");
-=item 1
-
-Call parent class's post_load() subroutine
+=item * Call parent class's post_load() subroutine
=cut
@@ -169,14 +163,26 @@ Call parent class's post_load() subrouti
return;
}
-=item *
-
-Run custom post_load scripts residing on the management node
+=item * Run custom post_load scripts residing on the management node
=cut
$self->run_management_node_tools_scripts('post_load');
+=item * Run custom post_load scripts residing in the image
+
+=cut
+
+ 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);
+ }
+
=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=1692426&r1=1692425&r2=1692426&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 Thu Jul 23
18:37:40 2015
@@ -161,7 +161,7 @@ sub pre_capture {
return;
}
-=item 1
+=item *
Call parent class's pre_capture() subroutine
@@ -178,12 +178,14 @@ Call parent class's pre_capture() subrou
notify($ERRORS{'OK'}, 0, "beginning Windows version 6 image pre-capture
tasks");
-=item 1
+=item *
Disable the following scheduled tasks:
* ScheduledDefrag - This task defragments the computers hard disk drives
+
* SR - This task creates regular system protection points
+
* Consolidator - If the user has consented to participate in the Windows
Customer Experience Improvement Program, this job collects and sends usage data
to Microsoft
=cut
@@ -241,9 +243,7 @@ sub post_load {
notify($ERRORS{'DEBUG'}, 0, "beginning Windows version 6 post-load
tasks");
-=item 1
-
-Call parent class's post_load() subroutine
+=item * Call parent class's post_load() subroutine
=cut
@@ -256,30 +256,38 @@ Call parent class's post_load() subrouti
return;
}
-=item *
-
-Ignore default routes configured for the private interface and use default
routes configured for the public interface
+=item * Ignore default routes configured for the private interface and use
default routes configured for the public interface
=cut
$self->set_ignore_default_routes();
-=item *
-
-Activate Windows license
+=item * Activate Windows license
=cut
$self->activate();
-=item *
-
-Run custom post_load scripts residing on the management node
+=item * Run custom post_load scripts residing on the management node
=cut
$self->run_management_node_tools_scripts('post_load');
+=item * Run custom post_load scripts residing in the image
+
+=cut
+
+ 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);
+ }
+
=back
=cut
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm?rev=1692426&r1=1692425&r2=1692426&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm Thu Jul
23 18:37:40 2015
@@ -107,7 +107,7 @@ sub pre_capture {
notify($ERRORS{'OK'}, 0, "beginning Windows 7 image capture preparation
tasks");
-=item 1
+=item *
Disable the following scheduled tasks:
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm?rev=1692426&r1=1692425&r2=1692426&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm
(original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm Thu
Jul 23 18:37:40 2015
@@ -108,7 +108,7 @@ sub pre_capture {
notify($ERRORS{'OK'}, 0, "beginning Windows Vista image capture
preparation tasks");
-=item 1
+=item *
Disable the following scheduled tasks:
