Author: arkurth
Date: Mon Apr 5 15:45:51 2010
New Revision: 930883
URL: http://svn.apache.org/viewvc?rev=930883&view=rev
Log:
VCL-301
Added call to rebaseall in update_cygwin.cmd so that it runs after an image is
loaded. This is needed for Windows 7 or else sporadic problems with sshd may
occur.
Modified:
incubator/vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd
Modified:
incubator/vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd?rev=930883&r1=930882&r2=930883&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd
(original)
+++ incubator/vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd
Mon Apr 5 15:45:51 2010
@@ -36,18 +36,18 @@ echo.
echo ----------------------------------------------------------------------
-echo %TIME%: Killing any cygrunsrv.exe processes...
-"%SystemRoot%\System32\taskkill.exe" /F /IM cygrunsrv.exe 2>&1
+echo %TIME%: Killing any cyg* processes...
+"%SystemRoot%\System32\taskkill.exe" /F /FI "IMAGENAME eq cyg*" 2>NUL
echo ERRORLEVEL: %ERRORLEVEL%
echo.
-echo %TIME%: Killing any sshd.exe processes...
-"%SystemRoot%\System32\taskkill.exe" /F /IM sshd.exe 2>&1
+echo %TIME%: Killing any ssh* processes...
+"%SystemRoot%\System32\taskkill.exe" /F /FI "IMAGENAME eq ssh*" 2>NUL
echo ERRORLEVEL: %ERRORLEVEL%
echo.
-echo %TIME%: Stopping the Cygwin sshd service...
-"%SystemRoot%\System32\net.exe" stop sshd 2>&1
+echo %TIME%: Killing any bash* processes...
+"%SystemRoot%\System32\taskkill.exe" /F /FI "IMAGENAME eq bash*" 2>NUL
echo ERRORLEVEL: %ERRORLEVEL%
echo.
@@ -134,6 +134,14 @@ echo.
echo ----------------------------------------------------------------------
+echo %TIME%: Running /usr/bin/rebaseall in the ash.exe shell
+C:\cygwin\bin\ash.exe -c '/usr/bin/rebaseall' 2>&1
+echo ERRORLEVEL: %ERRORLEVEL%
+set /A STATUS+=%ERRORLEVEL%
+echo.
+
+echo ----------------------------------------------------------------------
+
echo %TIME%: Setting sshd service startup mode to auto...
"%SystemRoot%\System32\sc.exe" config sshd start= auto 2>&1
echo ERRORLEVEL: %ERRORLEVEL%
