Commit e7481b71 authored by Russ Fish's avatar Russ Fish
Browse files

Tweaks from Feb 14.

parent aaf4cda1
......@@ -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");
}
......
......@@ -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!
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment