Commit 2fe38a0d authored by Leigh Stoller's avatar Leigh Stoller

Change testbed/reloading to emulab-ops/reloading. Maybe someday I'll

remove these hardwired strings.
parent 8e0c915d
......@@ -29,6 +29,12 @@ my $TB = "@prefix@";
use lib "@prefix@/lib";
use libdb;
#
# This stuff should not be hardwired in.
#
my $RELOADPID = "emulab-ops";
my $RELOADEID = "reloading";
my $osload = "$TB/bin/os_load";
my $nalloc = "$TB/bin/nalloc";
my $name = "";
......@@ -112,7 +118,7 @@ foreach my $node (@nodes) {
# XXX If you change testbed/reloading, be sure to update the
# test in doreboot() in tmcd/tmcd.c.
#
my $cmd = "$nalloc testbed reloading $pc";
my $cmd = "$nalloc $RELOADPID $RELOADEID $pc";
if ( system($cmd) != 0 ) {
print STDERR "WARNING: Could not reserve $pc!\n";
} else {
......
......@@ -17,6 +17,8 @@
#define TESTMODE
#define VERSION 2
#define NETMASK "255.255.255.0"
#define RELOADPID "emulab-ops"
#define RELOADEID "reloading"
/* Defined in configure and passed in via the makefile */
#define DBNAME_SIZE 64
......@@ -404,8 +406,8 @@ doreboot(int sock, struct in_addr ipaddr, char *rdata, int tcp)
* XXX This must match the reservation made in sched_reload
* in the tbsetup directory.
*/
if (strcmp(pid, "testbed") ||
strcmp(eid, "reloading")) {
if (strcmp(pid, RELOADPID) ||
strcmp(eid, RELOADEID)) {
return 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