Author: arkurth
Date: Tue Dec 7 17:43:12 2010
New Revision: 1043140
URL: http://svn.apache.org/viewvc?rev=1043140&view=rev
Log:
VCL-421
Updated Windows commands which call "cygstart.exe cmd.exe" to include the full
path $SYSTEMROOT/system32/cmd.exe. Cygwin 1.7 seems to have a bug where it
doesn't locate cmd.exe in the system32 directory and assumes cmd.exe resides in
/usr/bin.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm?rev=1043140&r1=1043139&r2=1043140&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm Tue Dec 7
17:43:12 2010
@@ -3487,7 +3487,7 @@ sub shutdown {
# Clear the event log before shutting down
$self->clear_event_log();
- my $shutdown_command = "/bin/cygstart.exe cmd.exe /c \"";
+ my $shutdown_command = "/bin/cygstart.exe \$SYSTEMROOT/system32/cmd.exe
/c \"";
if ($disable_dhcp) {
notify($ERRORS{'DEBUG'}, 0, "enabling DHCP and shutting down
$computer_node_name");
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm?rev=1043140&r1=1043139&r2=1043140&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_5.pm
Tue Dec 7 17:43:12 2010
@@ -271,7 +271,7 @@ sub run_sysprep {
# Assemble the Sysprep command
# Run Sysprep.exe, use cygstart to lauch the .exe and return immediately
- my $sysprep_command = "/bin/cygstart.exe cmd.exe /c \"";
+ my $sysprep_command = "/bin/cygstart.exe \$SYSTEMROOT/system32/cmd.exe
/c \"";
# Run Sysprep.exe
$sysprep_command .= "C:/Sysprep/sysprep.exe /quiet /reseal /mini
/forceshutdown & ";
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm?rev=1043140&r1=1043139&r2=1043140&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
Tue Dec 7 17:43:12 2010
@@ -1594,7 +1594,7 @@ EOF
$self->kill_process('logon.scr');
# Run Sysprep.exe, use cygstart to lauch the .exe and return immediately
- my $sysprep_command = "/bin/cygstart.exe cmd.exe /c \"";
+ my $sysprep_command = "/bin/cygstart.exe \$SYSTEMROOT/system32/cmd.exe
/c \"";
# Run Sysprep.exe
$sysprep_command .= "$system32_path/sysprep/sysprep.exe /generalize
/oobe /shutdown /quiet /unattend:\$SYSTEMROOT/System32/sysprep/Unattend.xml";
