Commit 5cdb144e authored by Leigh B. Stoller's avatar Leigh B. Stoller

Change check_setup() to check_nickname(), which looks for the nickname

file instead of contacting tmcd directly to find that info.
Basically, cut out 4 places where we contact tmcd on boot. I know, big
whoop.
parent 95eac6a3
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -39,7 +39,7 @@ if (JAILED()) {
$logtemplate = "$VARDIR/logs/runlog.XXXXXX";
}
else {
my ($pid, $eid, $vname) = check_status();
my ($pid, $eid, $vname) = check_nickname();
if (!defined($eid)) {
fatal("Could not determine pid/eid");
......
......@@ -104,6 +104,7 @@ script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/chipset.awk $(BINDIR)/chipset.awk
$(INSTALL) -m 755 $(SRCDIR)/cpuspeed.awk $(BINDIR)/cpuspeed.awk
$(INSTALL) -m 755 $(SRCDIR)/tbshutdown $(BINDIR)/tbshutdown
$(INSTALL) -m 755 $(SRCDIR)/delaysetup $(BINDIR)/delaysetup
$(INSTALL) -m 755 $(SRCDIR)/control_interface \
$(BINDIR)/control_interface
$(INSTALL) -m 644 $(SRCDIR)/gated_fxp0.conf $(BINDIR)/gated_fxp0.conf
......
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -23,13 +23,19 @@ my $MAPFILE = $libsetup::TMDELMAP;
if (! -s $MAPFILE) {
exit(0);
}
print "Starting Delay Agent ...\n";
#
# Need the pid/eid.
#
my ($pid, $eid, $vname) = check_nickname();
#
# We use the tmcc to figure out where the Testbed Event Daemon is running.
# Don't worry about the port for now.
#
my ($bossname) = split(" ", `tmcc bossinfo`);
system("delay-agent -s $bossname -d -f $MAPFILE &");
system("delay-agent -s $bossname -d -E $pid/$eid -f $MAPFILE &");
exit($? >> 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