Commit 6309bb00 authored by Kirk Webb's avatar Kirk Webb

Some minor plab fixups.

parent d6a7b23c
......@@ -42,7 +42,7 @@ FREE_TIMEOUT = 1*60 # give the node manager a minute to respond to free
TBOPS = "@TBOPSEMAIL@".replace("\\","")
MAILTAG = "@THISHOMEBASE@"
SCRIPTNAME = "Unknown" # should see if we can get the toplevel script name
SCRIPTNAME = sys.argv[0][sys.argv[0].rfind("/")+1:]
RESERVED_PID = "emulab-ops"
RESERVED_EID = "hwdown" # start life in hwdown
......@@ -1273,6 +1273,7 @@ class Slice:
tryXmlrpcCmd(self.agent.deleteSlice)
except:
print "Failed to delete PLC slice!"
traceback.print_exc()
try:
print "\tRemoving slice DB entry."
......
......@@ -84,7 +84,8 @@ if ($UID) {
die("*** $0:\n".
" $UID is not in the password file!\n");
if ($pwname ne "emulabman" && !($pwname =~ /emulab_[-\@\w]*/)) {
if ($pwname ne "emulabman" && !($pwname =~ /emulab_[-\@\w]*/) &&
!($pwname =~ /utah_[-\@\w]*/)) {
die("*** $0:\n".
" You do not have permission to run this script!\n");
}
......
......@@ -41,7 +41,7 @@ my $timeout = (60 * 60 * 12); # In seconds of course.
my $logname = "$LOGDIR/emulab-watchdog.debug";
my $pidfile = "/var/run/emulab-watchdog.pid";
my $debug = 0;
my $isalivewait = ((REMOTE() == 1) ? (PLAB() ? 600 : 60) ?
my $isalivewait = ((REMOTE() == 1) ? (PLAB() ? 600 : 60) :
(JAILED() ? 600 : 180)); # Seconds to wait.
my $driftfile;
my $vnodeid;
......
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