Commit cda869c6 authored by Austin Clements's avatar Austin Clements
Browse files

Minor modifications necessary to make the watchdog work on Plab. Mirrors

Jail changes.
parent cd473380
......@@ -165,7 +165,7 @@ $tmcctimeout = 30;
#
# Order matters!
#
if (($mounts || $doall) && !JAILED()) {
if (($mounts || $doall) && !JAILED() && !PLAB()) {
print "Updating project and home directories ... \n";
if (domounts()) {
......@@ -174,7 +174,8 @@ if (($mounts || $doall) && !JAILED()) {
}
}
if (($hostsfile || $doall) && !REMOTE()) {
if (($hostsfile || $doall) && (!REMOTE() || PLAB())) {
# Yes, the || PLAB() is intentional, since hostnames work on Plab
print "Updating Testbed hostnames configuration ... \n";
if (dohostnames()) {
......
......@@ -130,7 +130,7 @@ $SIG{INT} = \&handler;
#
# If jailed, get our jailname.
#
if (JAILED()) {
if (JAILED() || PLAB()) {
$vnodeid = libsetup_getvnodeid();
}
......@@ -168,7 +168,7 @@ while (1) {
# Skip all this stuff in jail.
next
if (JAILED());
if (JAILED() || PLAB());
#
# Send back ntpdrift info. Should move elsewhere.
......
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