Commit 97e8e31d authored by Kirk Webb's avatar Kirk Webb

oops - hook in rc.stargate.

parent 3b084bff
......@@ -261,6 +261,11 @@ sub CONTROL() { if (-e "$ETCDIR/isctrl") { return 1; } else { return 0; } }
# XXX If you change this, look in libtmcc::tmccgetconfig() as well.
sub WINDOWS() { if (-e "$ETCDIR/iscygwin") { return 1; } else { return 0; } }
#
# Same for a stargate/garcia node.
#
sub STARGATE() { if (-e "$ETCDIR/isstargate") { return 1; } else { return 0; } }
#
# Are we jailed? See above.
#
......
......@@ -307,6 +307,17 @@ 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) {
......
......@@ -57,6 +57,7 @@ sup-install: dir-install
bin-install: dir-install
etc-install: dir-install sysetc-remove sysetc-install
-cp -f /dev/null $(ETCDIR)/isstargate
sysetc-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/dhcpcd.exe $(SYSETCDIR)/dhcpc/dhcpcd.exe
......@@ -68,7 +69,7 @@ sysetc-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/testbed $(RCDIR)/init.d/testbed
$(INSTALL) -m 755 $(SRCDIR)/wireless.opts \
$(SYSETCDIR)/pcmcia/wireless.opts
-ln -sf $(RCDIR)/init.d/mountallwrapper.sh \
-ln -sf ../init.d/mountallwrapper.sh \
$(RCDIR)/rcS.d/S05mountallwrapper.sh
sysetc-remove:
......
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