Commit 8c306943 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

ZFS change; ZFS does not do toplevel mounts, so shared hosts have to be

treated like normal hosts (tmcd already was changed). This is fine for XEN,
but will break OpenVZ, but we can burn that bridge later.
parent 11c81db8
......@@ -67,6 +67,7 @@ my $ISOLATEADMIN= @ISOLATEADMINS@;
my $NOSHAREDFS = @NOSHAREDFS@;
my $LINUX_FSNODE= @LINUX_FSNODE@;
my $NFSMAPTOUSER= "@NFSMAPTOUSER@";
my $WITHZFS = @WITHZFS@;
# XXX for TESTMODE: output to stdout
my $TOSTDOUT = 0;
......@@ -278,9 +279,11 @@ while ($row = $nodes_result->fetchrow_hashref) {
$lastadmin=$admin;
$lasterole=$erole;
if ($erole eq "sharedhost" && !$isvirt) {
if ($erole eq "sharedhost" && !$isvirt && !$WITHZFS) {
#
# Shared local *physical* nodes get toplevel mounts.
# Shared local *physical* nodes get toplevel mounts.
#
# ZFS does not support toplevel mounts.
#
push(@dirlist, "$projdir");
push(@dirlist, "$groupdir");
......
Supports Markdown
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