Author: arkurth
Date: Wed Sep 2 13:28:47 2009
New Revision: 810499
URL: http://svn.apache.org/viewvc?rev=810499&view=rev
Log:
VCL-214
Changed order of scripts which are called from post_load.cmd so that
update_cygwin.cmd runs later on. The running of update_cygwin.cmd causes the
computer to respond to SSH. The vcld process detects this and tries proceeds
with the post_load steps. It's better to run the other tasks from post_load.cmd
before running update_cygwin.cmd so that they finish before the vcld process
detects the computer to be ready.
Modified:
incubator/vcl/trunk/managementnode/tools/Windows/Scripts/post_load.cmd
Modified: incubator/vcl/trunk/managementnode/tools/Windows/Scripts/post_load.cmd
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/tools/Windows/Scripts/post_load.cmd?rev=810499&r1=810498&r2=810499&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/tools/Windows/Scripts/post_load.cmd
(original)
+++ incubator/vcl/trunk/managementnode/tools/Windows/Scripts/post_load.cmd Wed
Sep 2 13:28:47 2009
@@ -46,35 +46,26 @@
start "debug_info.cmd" /WAIT cmd.exe /c "%SCRIPT_DIR%\debug_info.cmd >>
%LOGS_DIR%\debug_info.log 2>&1"
echo.
-
echo ----------------------------------------------------------------------
-echo %TIME%: Calling %SCRIPT_DIR%\configure_networking.vbs...
-start "configure_networking.vbs" /WAIT cmd.exe /c
"C:\Windows\system32\cscript.exe //NoLogo %SCRIPT_DIR%\configure_networking.vbs
>> %LOGS_DIR%\configure_networking.log 2>&1"
-echo ERRORLEVEL: %ERRORLEVEL%
-set /A STATUS+=%ERRORLEVEL%
-echo.
-
-echo ----------------------------------------------------------------------
-
-echo %TIME%: Calling %SCRIPT_DIR%\update_cygwin.cmd...
-start "update_cygwin.cmd" /WAIT cmd.exe /c "%SCRIPT_DIR%\update_cygwin.cmd >>
%LOGS_DIR%\update_cygwin.log 2>&1"
+echo %TIME%: Calling %SCRIPT_DIR%\autologon_disable.cmd...
+start "autologon_disable.cmd" /WAIT cmd.exe /c
"%SCRIPT_DIR%\autologon_disable.cmd >> %LOGS_DIR%\autologon_disable.log 2>&1"
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
echo ----------------------------------------------------------------------
-echo %TIME%: Calling %SCRIPT_DIR%\autologon_disable.cmd...
-start "autologon_disable.cmd" /WAIT cmd.exe /c
"%SCRIPT_DIR%\autologon_disable.cmd >> %LOGS_DIR%\autologon_disable.log 2>&1"
+echo %TIME%: Executing %SCRIPT_DIR%\delete_post_load_run_key.cmd...
+start "delete_post_load_run_key.cmd" /WAIT cmd.exe /c
"%SCRIPT_DIR%\delete_post_load_run_key.cmd >>
%LOGS_DIR%\delete_post_load_run_key.log 2>&1"
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
echo ----------------------------------------------------------------------
-echo %TIME%: Executing %SCRIPT_DIR%\delete_post_load_run_key.cmd...
-start "delete_post_load_run_key.cmd" /WAIT cmd.exe /c
"%SCRIPT_DIR%\delete_post_load_run_key.cmd >>
%LOGS_DIR%\delete_post_load_run_key.log 2>&1"
+echo %TIME%: Calling %SCRIPT_DIR%\configure_networking.vbs...
+start "configure_networking.vbs" /WAIT cmd.exe /c
"C:\Windows\system32\cscript.exe //NoLogo %SCRIPT_DIR%\configure_networking.vbs
>> %LOGS_DIR%\configure_networking.log 2>&1"
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
@@ -83,7 +74,7 @@
if exist "%SystemRoot%\post_load_custom.cmd" goto POST_LOAD_CUSTOM
echo Custom post-load script does not exist:
"%SystemRoot%\post_load_custom.cmd"
-goto EVENT_CREATE
+goto UPDATE_CYGWIN
:POST_LOAD_CUSTOM
echo %TIME%: Executing %SystemRoot%\post_load_custom.cmd...
@@ -92,7 +83,15 @@
set /A STATUS+=%ERRORLEVEL%
echo.
-:EVENT_CREATE
+echo ----------------------------------------------------------------------
+
+:UPDATE_CYGWIN
+echo %TIME%: Calling %SCRIPT_DIR%\update_cygwin.cmd...
+start "update_cygwin.cmd" /WAIT cmd.exe /c "%SCRIPT_DIR%\update_cygwin.cmd >>
%LOGS_DIR%\update_cygwin.log 2>&1"
+echo ERRORLEVEL: %ERRORLEVEL%
+set /A STATUS+=%ERRORLEVEL%
+echo.
+
echo ----------------------------------------------------------------------
echo %TIME%: Generating application event log entry: %COMPUTERNAME% is READY...
