Commit 7ca736ff authored by Mike Hibler's avatar Mike Hibler

Merge branch 'master' into newports

parents 096aeab2 f7c8831b
......@@ -620,7 +620,7 @@ if (! defined($slice_id)) {
$slice_id = $safe_uid . "-QV" . TBGetUniqueIndex('next_quickvm', 1);
}
my $slice_urn = GeniHRN::Generate("${OURDOMAIN}:${pid}", "slice", $slice_id);
my $slice_hrn = "${PGENIDOMAIN}.${slice_id}";
my $slice_hrn = "${PGENIDOMAIN}.${pid}.${slice_id}";
my $SERVER_NAME = (exists($ENV{"SERVER_NAME"}) ? $ENV{"SERVER_NAME"} : "");
#
......@@ -1440,6 +1440,9 @@ sub fatal($) {
$instance->SetStatus("failed")
if (defined($instance));
print STDERR Dumper($xmlparse)
if (defined($xmlparse));
print STDERR "*** $0:\n".
" $mesg\n";
exit(-1);
......
......@@ -4551,6 +4551,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \
tmcc/plab/GNUmakefile tmcc/cygwinseven/GNUmakefile \
tmcc/centos6/GNUmakefile \
tmcc/centos7/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \
os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile \
os/frisbee.redux/GNUmakefile \
......
......@@ -288,6 +288,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \
tmcc/plab/GNUmakefile tmcc/cygwinseven/GNUmakefile \
tmcc/centos6/GNUmakefile \
tmcc/centos7/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \
os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile \
os/frisbee.redux/GNUmakefile \
......
......@@ -31,7 +31,7 @@ touch /var/lock/subsys/tbprepare
# an S89tbprepare link. So we make sure systemd thinks it got started, and
# then the K89tbprepare links will be run appropriately...
#
if [ -x /bin/systemd ]; then
if [ -x /bin/systemd -o -x /lib/systemd/systemd ]; then
echo "Emulab scheduling tbprepare to run via systemd."
systemctl start tbprepare.service
fi
......
......@@ -1297,7 +1297,7 @@ sub GetProject($)
my $project = Project->Lookup($self->pid_idx());
if (! defined($project)) {
print("*** WARNING: Could not lookup project object for $self!", 1);
print("*** WARNING: Could not lookup project object for $self!\n");
return undef;
}
return $project;
......
......@@ -2040,7 +2040,7 @@ sub GetProject($)
my $project = Project->Lookup($self->pid());
if (! defined($project)) {
print("*** WARNING: Could not lookup project object for $self!", 1);
print("*** WARNING: Could not lookup project object for $self!\n");
return undef;
}
return $project;
......
......@@ -479,7 +479,7 @@ sub GetProject($)
my $project = Project->Lookup($self->pid_idx());
if (! defined($project)) {
print("*** WARNING: Could not lookup project object for $self!", 1);
print("*** WARNING: Could not lookup project object for $self!\n");
return undef;
}
return $project;
......
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -240,8 +240,12 @@ if ($ELABINELAB) {
# What if the node is on? Nothing is going to
# happen and changing the state is wrong.
#
$newstate = TBDB_NODESTATE_SHUTDOWN()
if ($oldstate eq TBDB_NODESTATE_POWEROFF());
if ($oldstate eq TBDB_NODESTATE_POWEROFF()) {
$newstate = TBDB_NODESTATE_SHUTDOWN()
} else {
$newstate = $oldstate;
}
}
print "$node: $oldstate, $newstate\n";
......@@ -249,7 +253,7 @@ if ($ELABINELAB) {
# Avoid sending duplicate events; annoys stated.
#
$node->SetEventState($newstate)
if (defined($newstate) && $newstate ne $oldstate);
if ($newstate ne $oldstate);
}
}
exit($rval);
......
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