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

Make exports_setup consistent with tmcd w.r.t. NOVIRTNFSMOUNTS.

Previously, we would not pass the mounts via tmcd but they were still
exported from fs.
parent a78faf27
......@@ -78,6 +78,7 @@ my $WITHZFS = @WITHZFS@;
my $ZFS_NOEXPORT= @ZFS_NOEXPORT@;
my $WITHAMD = @WITHAMD@;
my $INC_MOUNTD = @INCREMENTAL_MOUNTD@;
my $NOVNODENFS = @NOVIRTNFSMOUNTS@;
# XXX for TESTMODE: output to stdout
my $TOSTDOUT = 0;
......@@ -374,6 +375,10 @@ while ($row = $nodes_result->fetchrow_hashref) {
next
if ($isvirt && !$shared);
# Skip shared virtnode nodes too, if NFS disabled for them.
next
if ($NOVNODENFS && $isvirt && $shared);
if ($lastpid eq $pid && $lastgid eq $gid && $lasterole eq $erole &&
(!$ISOLATEADMIN || $lastadmin eq $admin)) {
# If this is for the same proj and group again, don't requery the db
......
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