Commit 3c2b850a authored by Timothy Stack's avatar Timothy Stack

Move the stargate startup stuff to before checking if the node is free

or not, otherwise the proper regmon module isn't installed and mote
loading won't work.
parent 1d2ddefb
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004 University of Utah and the Flux Group.
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -244,6 +244,17 @@ sub doboot()
}
}
#
# Run the stargate startup if necessary
#
if (-x "$RCDIR/rc.stargate" && STARGATE()) {
print("Firing off garcia/stargate processes\n");
system("$RCDIR/rc.stargate start");
if ($?) {
fatal("Error running $RCDIR/rc.stargate");
}
}
#
# At this point, if we are a free node just run the config scripts
# to clean things up, although there should not be anything to clean
......@@ -307,17 +318,6 @@ sub doboot()
return;
}
#
# Run the stargate startup if necessary
#
if (-x "$RCDIR/rc.stargate" && STARGATE()) {
print("Firing off garcia/stargate processes\n");
system("$RCDIR/rc.stargate start");
if ($?) {
fatal("Error running $RCDIR/rc.stargate");
}
}
# Now send ISUP
print("Informing Emulab Control that we are up and running\n");
if (tmcc(TMCCCMD_STATE, "ISUP") < 0) {
......
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