Commit cd08436c authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Move the request for the domain lower, after reboot/kill. Not needed,

but causes elabinelab reboot to fail (when doing a XEN elabinelab).
parent 03887bd0
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -219,21 +219,6 @@ my $pidfile = "/var/run/tbvnode-${vnodeid}.pid";
my $logname = "$LOGDIR/tbvnode-${vnodeid}.log";
my $alllogs = "$LOGDIR/tbvnode-${vnodeid}.all";
#
# Need the domain, but no conistent way to do it. Ask tmcc for the
# boss node and parse out the domain.
#
my $DOMAINNAME = tmccbossname();
die("Could not get bossname from tmcc!")
if (!defined($DOMAINNAME));
if ($DOMAINNAME =~ /^[-\w]+\.(.*)$/) {
$DOMAINNAME = $1;
}
else {
die("Could not parse domain name!");
}
#
# If killing/halting the virtual node, then kill the manager process.
#
......@@ -276,6 +261,21 @@ if (-e $pidfile) {
}
}
#
# Need the domain, but no conistent way to do it. Ask tmcc for the
# boss node and parse out the domain.
#
my $DOMAINNAME = tmccbossname();
die("Could not get bossname from tmcc!")
if (!defined($DOMAINNAME));
if ($DOMAINNAME =~ /^[-\w]+\.(.*)$/) {
$DOMAINNAME = $1;
}
else {
die("Could not parse domain name!");
}
# Tack the current log onto the end of a running file.
if (-e $logname) {
system("/bin/cat $logname >> $alllogs")
......@@ -380,9 +380,7 @@ if (! -e CONFDIR()) {
# Inform the TMCD we are setting up.
#
REBOOT:
if (!($dojail && $islinux)) {
tmcc(TMCCCMD_STATE, "BOOTING");
}
tmcc(TMCCCMD_STATE, "BOOTING");
#
# Invoke vnode setup routine in the setup library. This will talk to
......
Supports Markdown
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