All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit c3c50bc3 authored by Mike Hibler's avatar Mike Hibler

Comment out the explicit call to init-elabnodes.pl that is there for compat

with the old monitor.  Backward compat be damned!
parent d7a5ee6f
...@@ -259,10 +259,10 @@ if ($realplab && $initelab && !$use_simplemodel) { ...@@ -259,10 +259,10 @@ if ($realplab && $initelab && !$use_simplemodel) {
if (system "$pelabdir/$INITCOND -o /proj/$pid/exp/$eid/tmp/initial-conditions.txt $pid $eid") { if (system "$pelabdir/$INITCOND -o /proj/$pid/exp/$eid/tmp/initial-conditions.txt $pid $eid") {
warn "Could not acquire initial path conditions\n"; warn "Could not acquire initial path conditions\n";
} }
print "##### Initializing Emulab link characteristics\n"; # print "##### Initializing Emulab link characteristics\n";
if (system "$pelabdir/$INITCOND -C $pid $eid") { # if (system "$pelabdir/$INITCOND -C $pid $eid") {
warn "Error initializing Emulab links with initial path conditions\n"; # warn "Error initializing Emulab links with initial path conditions\n";
} # }
} }
print "##### Restarting servers\n"; print "##### Restarting servers\n";
...@@ -301,7 +301,7 @@ print "##### Starting stubs"; ...@@ -301,7 +301,7 @@ print "##### Starting stubs";
# print " with: '$stub_cmd $stub_cmdargs'"; # print " with: '$stub_cmd $stub_cmdargs'";
# $startarg = "'COMMAND=$stub_cmd $stub_cmdargs'"; # $startarg = "'COMMAND=$stub_cmd $stub_cmdargs'";
#} #}
#print "\n"; print "\n";
if ($realplab) { if ($realplab) {
if (system "$TEVC -e $pid/$eid now planetstubs start") { if (system "$TEVC -e $pid/$eid now planetstubs start") {
die "Error running tevc\n"; die "Error running tevc\n";
...@@ -313,17 +313,17 @@ if ($realplab) { ...@@ -313,17 +313,17 @@ if ($realplab) {
} }
#$startarg = ""; #$startarg = "";
print "##### Starting monitors\n"; print "##### Starting monitors";
#if ($mon_cmdargs ne $UNKNOWN) { #if ($mon_cmdargs ne $UNKNOWN) {
# print " with: '$mon_cmd $mon_cmdargs'"; # print " with: '$mon_cmd $mon_cmdargs'";
# $startarg = "'COMMAND=$mon_cmd $mon_cmdargs'"; # $startarg = "'COMMAND=$mon_cmd $mon_cmdargs'";
#} #}
#print "\n"; print "\n";
if (system "$TEVC -e $pid/$eid now monitorgroup start") { if (system "$TEVC -e $pid/$eid now monitorgroup start") {
die "Error running tevc\n"; die "Error running tevc\n";
} }
#print "##### Starting tcpdumps"; #print "##### Starting tcpdumps\n";
#if (system "$TEVC -e $pid/$eid now plabtcpdump start") { #if (system "$TEVC -e $pid/$eid now plabtcpdump start") {
# die "Error running tevc\n"; # die "Error running tevc\n";
#} #}
......
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