Tweaks from Feb 14.

tmcd/cygwinxp/prepare

@@ -214,6 +214,7 @@ if (! $noredef) {
     print "\nRedefining EmulabStartup.\n";
     my $firstboot = "/usr/local/etc/emulab/rc/rc.firstboot";
     my $bootsetup = "/usr/local/etc/emulab/rc/rc.bootsetup";
+    my $sshrun = "cygrunsrv -S sshd";
     my $progrun = "cygrunsrv -S ProgAgent";
     my $bootlog = "/var/log/bootsetup.log";
     system("cygrunsrv -R EmulabStartup");
@@ -221,7 +222,7 @@ if (! $noredef) {
 	   " --dep DHCP --dep elvinsvc.exe --dep W32Time" .
 	   " -p /cygdrive/c/cygwin/bin/bash" .
 	   " -a \"--norc --noprofile -c " .
-	   "      '( $firstboot; $bootsetup; $progrun ) >& $bootlog'\"");
+	   "      '( $firstboot; $bootsetup; $sshrun; $progrun ) >& $bootlog'\"");
     system("cygrunsrv -VQ EmulabStartup");
 }
 

tmcd/cygwinxp/rc.reboot

@@ -48,7 +48,7 @@ sleep 10
 
 # Give up, log it, ask for power cycle, and wait until timeout if that fails.
 logit "*** Failed to reboot.  Asking for power cycle."
-tmcc state 
+tmcc state WEDGED
 sleep 1200
 
 # Should never get here!