This is an automated email from the ASF dual-hosted git repository. jfthomps pushed a commit to branch vcl-2.5.1-bugfixes in repository https://gitbox.apache.org/repos/asf/vcl.git
commit c3a6c91fb15446c9b7d65a926e82f04ce1702f42 Author: Josh Thompson <[email protected]> AuthorDate: Wed Mar 19 19:45:57 2025 -0400 changed version number in lots of files applied patch from [VCL-1127] - Make changes to handle Cygwin's change of sshd service name to cygsshd --- managementnode/bin/cygwin-sshd-config.sh | 17 +++++++++++++---- managementnode/bin/gen-node-key.sh | 10 ++++++++++ managementnode/bin/health_check.pl | 2 +- managementnode/bin/monitor_vcld.pl | 2 +- managementnode/bin/upgrade_database.pl | 2 +- managementnode/bin/vcld | 2 +- managementnode/lib/VCL/DataStructure.pm | 2 +- managementnode/lib/VCL/Module.pm | 2 +- managementnode/lib/VCL/Module/OS.pm | 2 +- managementnode/lib/VCL/Module/OS/Linux.pm | 2 +- managementnode/lib/VCL/Module/OS/Linux/ESXi.pm | 2 +- .../lib/VCL/Module/OS/Linux/ManagementNode.pm | 2 +- managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm | 2 +- managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm | 2 +- managementnode/lib/VCL/Module/OS/Linux/firewall.pm | 2 +- .../lib/VCL/Module/OS/Linux/firewall/firewalld.pm | 2 +- .../lib/VCL/Module/OS/Linux/firewall/iptables.pm | 2 +- .../lib/VCL/Module/OS/Linux/firewall/ufw.pm | 2 +- managementnode/lib/VCL/Module/OS/Linux/init.pm | 2 +- managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm | 2 +- .../lib/VCL/Module/OS/Linux/init/Upstart.pm | 2 +- .../lib/VCL/Module/OS/Linux/init/systemd.pm | 2 +- managementnode/lib/VCL/Module/OS/OSX.pm | 2 +- managementnode/lib/VCL/Module/OS/Windows.pm | 20 +++++++++++++------- .../lib/VCL/Module/OS/Windows/Version_10/10.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_10/2016.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_5.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_5/2003.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_5/XP.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_6.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_6/2008.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_6/2012.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_6/7.pm | 2 +- .../lib/VCL/Module/OS/Windows/Version_6/8.pm | 4 ++-- .../lib/VCL/Module/OS/Windows/Version_6/Vista.pm | 2 +- managementnode/lib/VCL/Module/Predictive.pm | 2 +- managementnode/lib/VCL/Module/Predictive/Level_0.pm | 2 +- managementnode/lib/VCL/Module/Predictive/Level_1.pm | 2 +- managementnode/lib/VCL/Module/Predictive/Level_2.pm | 2 +- managementnode/lib/VCL/Module/Provisioning.pm | 2 +- managementnode/lib/VCL/Module/Provisioning/Lab.pm | 2 +- .../lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm | 2 +- .../lib/VCL/Module/Provisioning/VMware/VMware.pm | 2 +- .../VCL/Module/Provisioning/VMware/vSphere_SDK.pm | 2 +- .../lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm | 2 +- managementnode/lib/VCL/Module/Provisioning/docker.pm | 2 +- .../lib/VCL/Module/Provisioning/libvirt.pm | 2 +- .../lib/VCL/Module/Provisioning/libvirt/KVM.pm | 2 +- managementnode/lib/VCL/Module/Provisioning/one.pm | 2 +- .../lib/VCL/Module/Provisioning/openstack.pm | 2 +- managementnode/lib/VCL/Module/Provisioning/vbox.pm | 2 +- managementnode/lib/VCL/Module/Provisioning/xCAT.pm | 2 +- managementnode/lib/VCL/Module/Semaphore.pm | 2 +- managementnode/lib/VCL/Module/State.pm | 2 +- managementnode/lib/VCL/blockrequest.pm | 2 +- managementnode/lib/VCL/healthcheck.pm | 2 +- managementnode/lib/VCL/image.pm | 2 +- managementnode/lib/VCL/inuse.pm | 2 +- managementnode/lib/VCL/makeproduction.pm | 2 +- managementnode/lib/VCL/new.pm | 2 +- managementnode/lib/VCL/reclaim.pm | 2 +- managementnode/lib/VCL/reserved.pm | 2 +- managementnode/lib/VCL/utils.pm | 2 +- .../tools/Windows/Scripts/update_cygwin.cmd | 6 ++++-- 64 files changed, 101 insertions(+), 74 deletions(-) diff --git a/managementnode/bin/cygwin-sshd-config.sh b/managementnode/bin/cygwin-sshd-config.sh index c5b71801..683f130a 100755 --- a/managementnode/bin/cygwin-sshd-config.sh +++ b/managementnode/bin/cygwin-sshd-config.sh @@ -131,9 +131,17 @@ if [ $? -ne 0 ]; then die "failed to configure / mount point"; fi; mount print_hr +sshdservice=$(sc queryex type= service state= all | grep sshd | grep SERVICE_NAME | awk '{print $2}' | sed 's/ //g') + +if [[ $sshdservice == "" ]]; then + sshdservice=sshd +fi + +echo "sshd service name is $sshdservice" + # Stop and kill all sshd processes echo Stopping sshd service if it is running -net stop sshd 2>/dev/null +net stop $sshdservice 2>/dev/null print_hr echo Killing any sshd.exe processes @@ -146,7 +154,7 @@ print_hr # Delete the sshd service if it already exists echo Deleting sshd service if it already exists -$SYSTEMROOT/system32/sc.exe delete sshd +$SYSTEMROOT/system32/sc.exe delete $sshdservice print_hr # Make sure sshd service registry key is gone @@ -154,6 +162,7 @@ print_hr # This prevents the service from being reinstalled echo Deleting sshd service registry key reg.exe DELETE 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\sshd' /f +reg.exe DELETE "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\${sshdservice}" /f print_hr # Delete sshd user, a new account will be created @@ -377,8 +386,8 @@ echo rebaseall exit status: %ERRORLEVEL% IF ERRORLEVEL 1 exit /b %ERRORLEVEL% echo. -echo Starting Cygwin SSHD service -net start sshd +echo Starting Cygwin SSHD service (${sshdservice}) +net start ${sshdservice} IF ERRORLEVEL 1 exit /b %ERRORLEVEL% echo /var/log/sshd.log ending: diff --git a/managementnode/bin/gen-node-key.sh b/managementnode/bin/gen-node-key.sh index 56ae6917..370e14bb 100755 --- a/managementnode/bin/gen-node-key.sh +++ b/managementnode/bin/gen-node-key.sh @@ -151,6 +151,16 @@ case $OS in die "Unsupported OS found, OS call reported $OS";; esac +# if OS is CYGWIN, try to determine sshd service name +if [[ $OS =~ (CYGWIN) ]]; then + sshdservice=`ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE "sc queryex type= service state= all | grep sshd | grep SERVICE_NAME | awk '{print \\$2}' | sed 's/ //g'"` + if [[ $sshdservice != "" && $sshdservice != "sshd" ]]; then + echo "Detected CYGWIN with alternate sshd service name: $sshdservice" + SSHSTOP="net stop $sshdservice" + SSHSTART="net start $sshdservice" + fi +fi + echo Setting PasswordAuthentication to no in sshd_config on $NODE ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE 'sed -i -r -e "s/^[ #]*(PasswordAuthentication).*/\1 no/"' $SSHDCONFIG ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE 'grep "^[ #]*PasswordAuthentication"' $SSHDCONFIG diff --git a/managementnode/bin/health_check.pl b/managementnode/bin/health_check.pl index 4676837d..ae7538eb 100755 --- a/managementnode/bin/health_check.pl +++ b/managementnode/bin/health_check.pl @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../lib"; use base qw(); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/bin/monitor_vcld.pl b/managementnode/bin/monitor_vcld.pl index 9ea636e8..d653206e 100755 --- a/managementnode/bin/monitor_vcld.pl +++ b/managementnode/bin/monitor_vcld.pl @@ -53,7 +53,7 @@ use FindBin; use lib "$FindBin::Bin/../lib"; # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; use strict; use warnings; diff --git a/managementnode/bin/upgrade_database.pl b/managementnode/bin/upgrade_database.pl index 1a6710cc..b98bd1d3 100755 --- a/managementnode/bin/upgrade_database.pl +++ b/managementnode/bin/upgrade_database.pl @@ -41,7 +41,7 @@ use FindBin; use lib "$FindBin::Bin/../lib"; # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/bin/vcld b/managementnode/bin/vcld index 2dd919cd..b8d1d739 100755 --- a/managementnode/bin/vcld +++ b/managementnode/bin/vcld @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../lib"; use base qw(); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/DataStructure.pm b/managementnode/lib/VCL/DataStructure.pm index 558c09fb..99105602 100644 --- a/managementnode/lib/VCL/DataStructure.pm +++ b/managementnode/lib/VCL/DataStructure.pm @@ -66,7 +66,7 @@ use lib "$FindBin::Bin/.."; use base qw(); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module.pm b/managementnode/lib/VCL/Module.pm index ea750fe2..52bb753a 100644 --- a/managementnode/lib/VCL/Module.pm +++ b/managementnode/lib/VCL/Module.pm @@ -74,7 +74,7 @@ use lib "$FindBin::Bin/.."; use base qw(); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS.pm b/managementnode/lib/VCL/Module/OS.pm index 32c25cfc..9fded20d 100644 --- a/managementnode/lib/VCL/Module/OS.pm +++ b/managementnode/lib/VCL/Module/OS.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../.."; use base qw(VCL::Module); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux.pm b/managementnode/lib/VCL/Module/OS/Linux.pm index dda70ab1..dfa7c860 100644 --- a/managementnode/lib/VCL/Module/OS/Linux.pm +++ b/managementnode/lib/VCL/Module/OS/Linux.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::OS); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/ESXi.pm b/managementnode/lib/VCL/Module/OS/Linux/ESXi.pm index dfed9453..5dc11cda 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/ESXi.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/ESXi.pm @@ -44,7 +44,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::OS::Linux); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm b/managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm index f4a63a84..05a3c5f1 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/ManagementNode.pm @@ -44,7 +44,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::OS::Linux); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm b/managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm index 3df350b6..29120ee8 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/Ubuntu.pm @@ -39,7 +39,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::OS::Linux); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm b/managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm index f0be3fa4..8f04f2e2 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/UnixLab.pm @@ -35,7 +35,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::OS::Linux); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/firewall.pm b/managementnode/lib/VCL/Module/OS/Linux/firewall.pm index 7639ec63..a4f9c526 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/firewall.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/firewall.pm @@ -40,7 +40,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/firewall/firewalld.pm b/managementnode/lib/VCL/Module/OS/Linux/firewall/firewalld.pm index e9274982..73e3b372 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/firewall/firewalld.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/firewall/firewalld.pm @@ -39,7 +39,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Linux::firewall::iptables); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; our @ISA; diff --git a/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm b/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm index eb28b489..815ee3a5 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm @@ -39,7 +39,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Linux::firewall); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; our @ISA; diff --git a/managementnode/lib/VCL/Module/OS/Linux/firewall/ufw.pm b/managementnode/lib/VCL/Module/OS/Linux/firewall/ufw.pm index 4b449aa8..ae6330c6 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/firewall/ufw.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/firewall/ufw.pm @@ -39,7 +39,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Linux::firewall::iptables); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; our @ISA; diff --git a/managementnode/lib/VCL/Module/OS/Linux/init.pm b/managementnode/lib/VCL/Module/OS/Linux/init.pm index 88faed07..31d50d4c 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/init.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/init.pm @@ -40,7 +40,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm b/managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm index 810889a3..c693cb09 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/init/SysV.pm @@ -42,7 +42,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Linux::init); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/init/Upstart.pm b/managementnode/lib/VCL/Module/OS/Linux/init/Upstart.pm index 2848b93a..9fe25922 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/init/Upstart.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/init/Upstart.pm @@ -41,7 +41,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Linux::init); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Linux/init/systemd.pm b/managementnode/lib/VCL/Module/OS/Linux/init/systemd.pm index 5d675876..33db65a5 100644 --- a/managementnode/lib/VCL/Module/OS/Linux/init/systemd.pm +++ b/managementnode/lib/VCL/Module/OS/Linux/init/systemd.pm @@ -42,7 +42,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Linux::init); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/OSX.pm b/managementnode/lib/VCL/Module/OS/OSX.pm index b58e81df..8f490656 100644 --- a/managementnode/lib/VCL/Module/OS/OSX.pm +++ b/managementnode/lib/VCL/Module/OS/OSX.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::OS); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows.pm b/managementnode/lib/VCL/Module/OS/Windows.pm index dde48d7a..32279227 100644 --- a/managementnode/lib/VCL/Module/OS/Windows.pm +++ b/managementnode/lib/VCL/Module/OS/Windows.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::OS); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; @@ -673,7 +673,7 @@ sub pre_capture { =cut - if (!$self->set_service_startup_mode('sshd', 'manual')) { + if (!$self->set_service_startup_mode('sshd', 'manual') && !$self->set_service_startup_mode('cygsshd', 'manual')) { notify($ERRORS{'WARNING'}, 0, "unable to set sshd service startup mode to manual"); return 0; } @@ -786,7 +786,7 @@ sub post_load { =cut - if (!$self->set_service_startup_mode('sshd', 'auto')) { + if (!$self->set_service_startup_mode('sshd', 'auto') && !$self->set_service_startup_mode('cygsshd', 'auto')) { notify($ERRORS{'WARNING'}, 0, "unable to set sshd service startup mode to auto"); return 0; } @@ -2349,15 +2349,21 @@ sub set_password { # Get the list of services my @services = $self->get_services_using_login_id($username); if ($username eq 'root' && !@services) { - @services = ('sshd'); + @services = ('sshd', 'cygsshd'); } + my $success = 0; for my $service (@services) { notify($ERRORS{'DEBUG'}, 0, "$service service is configured to run as $username, updating service credentials"); - if (!$self->set_service_credentials($service, $username, $password)) { - notify($ERRORS{'WARNING'}, 0, "failed to set $service service credentials to $username ($password)"); + if ($self->set_service_credentials($service, $username, $password)) { + $success = 1; + last; } } + if(!$success) { + my $servicelist = join(', ', @services); + notify($ERRORS{'WARNING'}, 0, "failed to set credentials to $username ($password) for any of $servicelist"); + } # Get the scheduled tasks - check if any are configured to run as the user my $scheduled_task_info = $self->get_scheduled_task_info(); @@ -3939,7 +3945,7 @@ sub reboot { } # Set sshd service startup mode to manual - if (!$self->set_service_startup_mode('sshd', 'manual')) { + if (!$self->set_service_startup_mode('sshd', 'manual') && !$self->set_service_startup_mode('cygsshd', 'manual')) { notify($ERRORS{'WARNING'}, 0, "reboot not attempted, unable to set sshd service startup mode to manual"); return 0; } diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_10/10.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_10/10.pm index 7558c4a0..d3d2ee1e 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_10/10.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_10/10.pm @@ -40,7 +40,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_6::8); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_10/2016.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_10/2016.pm index fe34fea2..99c8d419 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_10/2016.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_10/2016.pm @@ -40,7 +40,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_6::8); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm index 8604168b..4897f168 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm @@ -40,7 +40,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::OS::Windows); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_5/2003.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_5/2003.pm index 983213c3..efa3a462 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_5/2003.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_5/2003.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_5); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_5/XP.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_5/XP.pm index a85c4a16..247109d1 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_5/XP.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_5/XP.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_5); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm index 8c1089e9..6fa16b82 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm @@ -45,7 +45,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::OS::Windows); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/2008.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/2008.pm index 6958575b..208645ec 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/2008.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/2008.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_6); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/2012.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/2012.pm index 1a006515..f1ace865 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/2012.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/2012.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_6); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm index 6d3903bd..d41260f8 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/7.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_6); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm index aa9bae83..5c262ff6 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/8.pm @@ -39,7 +39,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_6); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; @@ -134,7 +134,7 @@ sub pre_capture { } # Set the sshd service startup mode to disabled so that it does not start up until properly configured - if (!$self->set_service_startup_mode('sshd', 'disabled')) { + if (!$self->set_service_startup_mode('sshd', 'disabled') && !$self->set_service_startup_mode('cygsshd', 'disabled')) { notify($ERRORS{'WARNING'}, 0, "sshd service could not be disabled before shutting down computer"); return; } diff --git a/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm b/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm index 65376dfd..19da42fb 100644 --- a/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm +++ b/managementnode/lib/VCL/Module/OS/Windows/Version_6/Vista.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../../../.."; use base qw(VCL::Module::OS::Windows::Version_6); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Predictive.pm b/managementnode/lib/VCL/Module/Predictive.pm index 8155757a..182e09fd 100644 --- a/managementnode/lib/VCL/Module/Predictive.pm +++ b/managementnode/lib/VCL/Module/Predictive.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../.."; use base qw(VCL::Module); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Predictive/Level_0.pm b/managementnode/lib/VCL/Module/Predictive/Level_0.pm index 5596f03f..b170379a 100644 --- a/managementnode/lib/VCL/Module/Predictive/Level_0.pm +++ b/managementnode/lib/VCL/Module/Predictive/Level_0.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Predictive); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Predictive/Level_1.pm b/managementnode/lib/VCL/Module/Predictive/Level_1.pm index 78073e2e..3405ce8f 100644 --- a/managementnode/lib/VCL/Module/Predictive/Level_1.pm +++ b/managementnode/lib/VCL/Module/Predictive/Level_1.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Predictive); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Predictive/Level_2.pm b/managementnode/lib/VCL/Module/Predictive/Level_2.pm index 5c3983ce..a7f4d28d 100644 --- a/managementnode/lib/VCL/Module/Predictive/Level_2.pm +++ b/managementnode/lib/VCL/Module/Predictive/Level_2.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Predictive); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning.pm b/managementnode/lib/VCL/Module/Provisioning.pm index 5616bf32..5ec271b3 100644 --- a/managementnode/lib/VCL/Module/Provisioning.pm +++ b/managementnode/lib/VCL/Module/Provisioning.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../.."; use base qw(VCL::Module); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/Lab.pm b/managementnode/lib/VCL/Module/Provisioning/Lab.pm index c14398df..92b9ad0a 100644 --- a/managementnode/lib/VCL/Module/Provisioning/Lab.pm +++ b/managementnode/lib/VCL/Module/Provisioning/Lab.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Provisioning); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm b/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm index bf0f3d09..b7ba7d48 100644 --- a/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm +++ b/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm @@ -47,7 +47,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::Provisioning::VMware::VMware); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm b/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm index c19807c6..91c193bd 100644 --- a/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm +++ b/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm @@ -49,7 +49,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::Provisioning); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm b/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm index fc67a311..3a907adf 100644 --- a/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm +++ b/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm @@ -47,7 +47,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::Provisioning::VMware::VMware); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm b/managementnode/lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm index 09086c92..95016897 100644 --- a/managementnode/lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm +++ b/managementnode/lib/VCL/Module/Provisioning/VMware/vmware_cmd.pm @@ -46,7 +46,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::Provisioning::VMware::VMware); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/docker.pm b/managementnode/lib/VCL/Module/Provisioning/docker.pm index b8e380b1..ddb405e4 100644 --- a/managementnode/lib/VCL/Module/Provisioning/docker.pm +++ b/managementnode/lib/VCL/Module/Provisioning/docker.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Provisioning); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/libvirt.pm b/managementnode/lib/VCL/Module/Provisioning/libvirt.pm index 6f2dea8d..88e6cbab 100644 --- a/managementnode/lib/VCL/Module/Provisioning/libvirt.pm +++ b/managementnode/lib/VCL/Module/Provisioning/libvirt.pm @@ -46,7 +46,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Provisioning); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm b/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm index decfb4d2..e873604c 100644 --- a/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm +++ b/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm @@ -42,7 +42,7 @@ use lib "$FindBin::Bin/../../../.."; use base qw(VCL::Module::Provisioning::libvirt); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/one.pm b/managementnode/lib/VCL/Module/Provisioning/one.pm index d5921d7a..e552533d 100644 --- a/managementnode/lib/VCL/Module/Provisioning/one.pm +++ b/managementnode/lib/VCL/Module/Provisioning/one.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Provisioning); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/openstack.pm b/managementnode/lib/VCL/Module/Provisioning/openstack.pm index b2d2ffcd..c841242d 100644 --- a/managementnode/lib/VCL/Module/Provisioning/openstack.pm +++ b/managementnode/lib/VCL/Module/Provisioning/openstack.pm @@ -46,7 +46,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Provisioning); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/vbox.pm b/managementnode/lib/VCL/Module/Provisioning/vbox.pm index e7ce229c..a28ad57a 100644 --- a/managementnode/lib/VCL/Module/Provisioning/vbox.pm +++ b/managementnode/lib/VCL/Module/Provisioning/vbox.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Provisioning); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Provisioning/xCAT.pm b/managementnode/lib/VCL/Module/Provisioning/xCAT.pm index 1b06029f..ff86a16a 100644 --- a/managementnode/lib/VCL/Module/Provisioning/xCAT.pm +++ b/managementnode/lib/VCL/Module/Provisioning/xCAT.pm @@ -50,7 +50,7 @@ use lib "$FindBin::Bin/../../.."; use base qw(VCL::Module::Provisioning); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/Semaphore.pm b/managementnode/lib/VCL/Module/Semaphore.pm index 61d420ca..2048b781 100644 --- a/managementnode/lib/VCL/Module/Semaphore.pm +++ b/managementnode/lib/VCL/Module/Semaphore.pm @@ -50,7 +50,7 @@ use lib "$FindBin::Bin/../.."; use base qw(VCL::Module); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/Module/State.pm b/managementnode/lib/VCL/Module/State.pm index 24dd5390..b879d6c1 100644 --- a/managementnode/lib/VCL/Module/State.pm +++ b/managementnode/lib/VCL/Module/State.pm @@ -44,7 +44,7 @@ use lib "$FindBin::Bin/../.."; use base qw(VCL::Module); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/blockrequest.pm b/managementnode/lib/VCL/blockrequest.pm index 6849f9ab..a9a85d26 100644 --- a/managementnode/lib/VCL/blockrequest.pm +++ b/managementnode/lib/VCL/blockrequest.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/.."; use base qw(VCL::Module::State); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/healthcheck.pm b/managementnode/lib/VCL/healthcheck.pm index 3158c1b1..8a8d8179 100644 --- a/managementnode/lib/VCL/healthcheck.pm +++ b/managementnode/lib/VCL/healthcheck.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/.."; use base qw(); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/image.pm b/managementnode/lib/VCL/image.pm index 9091d1ea..c669b7d7 100644 --- a/managementnode/lib/VCL/image.pm +++ b/managementnode/lib/VCL/image.pm @@ -57,7 +57,7 @@ use lib "$FindBin::Bin/.."; use base qw(VCL::Module::State); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/inuse.pm b/managementnode/lib/VCL/inuse.pm index 3c8dbce3..5595428a 100644 --- a/managementnode/lib/VCL/inuse.pm +++ b/managementnode/lib/VCL/inuse.pm @@ -71,7 +71,7 @@ use lib "$FindBin::Bin/.."; use base qw(VCL::Module::State); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/makeproduction.pm b/managementnode/lib/VCL/makeproduction.pm index 279a78e5..8b909ad0 100644 --- a/managementnode/lib/VCL/makeproduction.pm +++ b/managementnode/lib/VCL/makeproduction.pm @@ -57,7 +57,7 @@ use lib "$FindBin::Bin/.."; use base qw(VCL::Module::State); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/new.pm b/managementnode/lib/VCL/new.pm index 2573d5a0..6af3d397 100644 --- a/managementnode/lib/VCL/new.pm +++ b/managementnode/lib/VCL/new.pm @@ -57,7 +57,7 @@ use lib "$FindBin::Bin/.."; use base qw(VCL::Module::State); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/reclaim.pm b/managementnode/lib/VCL/reclaim.pm index 4321edc1..7d9952b7 100644 --- a/managementnode/lib/VCL/reclaim.pm +++ b/managementnode/lib/VCL/reclaim.pm @@ -57,7 +57,7 @@ use lib "$FindBin::Bin/.."; use base qw(VCL::Module::State); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/reserved.pm b/managementnode/lib/VCL/reserved.pm index 6e51d04d..634d5f17 100644 --- a/managementnode/lib/VCL/reserved.pm +++ b/managementnode/lib/VCL/reserved.pm @@ -61,7 +61,7 @@ use lib "$FindBin::Bin/.."; use base qw(VCL::Module::State); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/lib/VCL/utils.pm b/managementnode/lib/VCL/utils.pm index 5f7b6ae6..c9b4bcd4 100644 --- a/managementnode/lib/VCL/utils.pm +++ b/managementnode/lib/VCL/utils.pm @@ -43,7 +43,7 @@ use lib "$FindBin::Bin/.."; use base qw(); # Specify the version of this module -our $VERSION = '2.5.1'; +our $VERSION = '2.5.2'; # Specify the version of Perl to use use 5.008000; diff --git a/managementnode/tools/Windows/Scripts/update_cygwin.cmd b/managementnode/tools/Windows/Scripts/update_cygwin.cmd index c09d9dd2..64d854a6 100755 --- a/managementnode/tools/Windows/Scripts/update_cygwin.cmd +++ b/managementnode/tools/Windows/Scripts/update_cygwin.cmd @@ -172,14 +172,16 @@ echo. echo ---------------------------------------------------------------------- +sc queryex type= service state= all | findstr "cygsshd" > nul && SET sshdservice=cygsshd || SET sshdservice=sshd + echo %TIME%: Setting sshd service startup mode to auto... -"%SystemRoot%\System32\sc.exe" config sshd start= auto 2>&1 +"%SystemRoot%\System32\sc.exe" config %sshdservice% start= auto 2>&1 echo ERRORLEVEL: %ERRORLEVEL% set /A STATUS+=%ERRORLEVEL% echo. echo %TIME%: Starting the sshd service... -"%SystemRoot%\System32\net.exe" start sshd 2>&1 +"%SystemRoot%\System32\net.exe" start %sshdservice% 2>&1 echo ERRORLEVEL: %ERRORLEVEL% set /A STATUS+=%ERRORLEVEL% echo.
