Author: arkurth
Date: Mon Aug 13 17:14:20 2012
New Revision: 1372520
URL: http://svn.apache.org/viewvc?rev=1372520&view=rev
Log:
VCL-616
Fixed problem in update_cygwin.cmd caused by a bug in the current version of
Cygwin if ssh-keygen.exe is run from a non-Cygwin shell. Wrapped ssh-keygen.exe
commands in "bash.exe -c".
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/tools/Windows/Scripts/update_cygwin.cmd
vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/tools/Windows/Scripts/update_cygwin.cmd
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/tools/Windows/Scripts/update_cygwin.cmd?rev=1372520&r1=1372519&r2=1372520&view=diff
==============================================================================
---
vcl/branches/vcl-2.3-bugfixes/managementnode/tools/Windows/Scripts/update_cygwin.cmd
(original)
+++
vcl/branches/vcl-2.3-bugfixes/managementnode/tools/Windows/Scripts/update_cygwin.cmd
Mon Aug 13 17:14:20 2012
@@ -115,19 +115,19 @@ echo ERRORLEVEL: %ERRORLEVEL%
echo.
echo %TIME%: Regenerating /etc/ssh_host_key...
-C:\Cygwin\bin\ssh-keygen.exe -t rsa1 -f /etc/ssh_host_key -N "" 2>&1
+C:\Cygwin\bin\bash.exe -c 'C:/Cygwin/bin/ssh-keygen.exe -t rsa1 -f
/etc/ssh_host_key -N ""' 2>&1
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
echo %TIME%: Regenerating /etc/ssh_host_rsa_key...
-C:\Cygwin\bin\ssh-keygen.exe -t rsa -f /etc/ssh_host_rsa_key -N "" 2>&1
+C:\Cygwin\bin\bash.exe -c 'C:/Cygwin/bin/ssh-keygen.exe -t rsa -f
/etc/ssh_host_rsa_key -N ""' 2>&1
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
echo %TIME%: Regenerating /etc/ssh_host_dsa_key...
-C:\Cygwin\bin\ssh-keygen.exe -t dsa -f /etc/ssh_host_dsa_key -N "" 2>&1
+C:\Cygwin\bin\bash.exe -c 'C:/Cygwin/bin/ssh-keygen.exe -t dsa -f
/etc/ssh_host_dsa_key -N ""' 2>&1
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
Modified: vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd?rev=1372520&r1=1372519&r2=1372520&view=diff
==============================================================================
--- vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd (original)
+++ vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd Mon Aug 13
17:14:20 2012
@@ -115,19 +115,19 @@ echo ERRORLEVEL: %ERRORLEVEL%
echo.
echo %TIME%: Regenerating /etc/ssh_host_key...
-C:\Cygwin\bin\ssh-keygen.exe -t rsa1 -f /etc/ssh_host_key -N "" 2>&1
+C:\Cygwin\bin\bash.exe -c 'C:/Cygwin/bin/ssh-keygen.exe -t rsa1 -f
/etc/ssh_host_key -N ""' 2>&1
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
echo %TIME%: Regenerating /etc/ssh_host_rsa_key...
-C:\Cygwin\bin\ssh-keygen.exe -t rsa -f /etc/ssh_host_rsa_key -N "" 2>&1
+C:\Cygwin\bin\bash.exe -c 'C:/Cygwin/bin/ssh-keygen.exe -t rsa -f
/etc/ssh_host_rsa_key -N ""' 2>&1
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
echo %TIME%: Regenerating /etc/ssh_host_dsa_key...
-C:\Cygwin\bin\ssh-keygen.exe -t dsa -f /etc/ssh_host_dsa_key -N "" 2>&1
+C:\Cygwin\bin\bash.exe -c 'C:/Cygwin/bin/ssh-keygen.exe -t dsa -f
/etc/ssh_host_dsa_key -N ""' 2>&1
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
