Commit c2589b8f authored by Leigh Stoller's avatar Leigh Stoller

Minor tweak to isMounted() to handle OPSVM_ENABLE && WITHZFS; we do not

have to wait, they are instantly mounted on boss, but do not show up in
mount output.
parent c23bf2ac
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
# Copyright (c) 2000-2019 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -49,6 +49,7 @@ use POSIX qw(:signal_h);
# Configure variables.
my $TB = "@prefix@";
my $OPSVM_ENABLE = @OPSVM_ENABLE@;
my $WITHZFS = @WITHZFS@;
my $CHFLAGS = "/bin/chflags";
#
......@@ -935,6 +936,12 @@ sub isMounted($)
my $MOUNT = "/sbin/mount";
my $WITHAMD = @WITHAMD@;
my $AMDROOT = "@AMD_ROOT@";
if ($OPSVM_ENABLE && $WITHZFS) {
return 0
if (! -e $dir);
return 1;
}
if ($WITHAMD) {
$dir = "${AMDROOT}${dir}";
......
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