Commit 8148afa1 authored by Leigh Stoller's avatar Leigh Stoller

Another ZFS change; return normal mounts (instead of top level) mounts to

shared hosts. This is required for OpenVZ but not for XEN, so this does
mean that when using ZFS, shared OpenVZ hosts are not supported. Not likely
to be a problem.
parent 56e25542
......@@ -66,3 +66,4 @@
#undef IMAGEDELTAS
#undef NOVIRTNFSMOUNTS
#undef WITHZFS
......@@ -5103,7 +5103,7 @@ NFSMAPTOUSER="root"
IMAGEPROVENANCE=0
IMAGEDELTAS=0
PROFILEVERSIONS=0
NOVIRTNFSMOUNTS=0;
NOVIRTNFSMOUNTS=0
WITHZFS=0
ZFS_ROOT=z
ZFS_QUOTA_USER="1G"
......@@ -5495,6 +5495,12 @@ if test $NOVIRTNFSMOUNTS -eq 1; then
#define NOVIRTNFSMOUNTS 1
_ACEOF
fi
if test $WITHZFS -eq 1; then
cat >>confdefs.h <<_ACEOF
#define WITHZFS 1
_ACEOF
fi
cat >>confdefs.h <<_ACEOF
#define IMPORT_TMPDIR "$IMPORT_TMPDIR"
......
......@@ -652,7 +652,10 @@ if test $IMAGEDELTAS -eq 1; then
AC_DEFINE_UNQUOTED(IMAGEDELTAS, 1)
fi
if test $NOVIRTNFSMOUNTS -eq 1; then
AC_DEFINE_UNQUOTED(NOVIRTNFSMOUNTS=0, 1)
AC_DEFINE_UNQUOTED(NOVIRTNFSMOUNTS, 1)
fi
if test $WITHZFS -eq 1; then
AC_DEFINE_UNQUOTED(WITHZFS, 1)
fi
AC_DEFINE_UNQUOTED(IMPORT_TMPDIR, "$IMPORT_TMPDIR")
......
......@@ -145,6 +145,13 @@ CHECKMASK(char *arg)
#define WITHPROVENANCE 0
#endif
#ifdef WITHZFS
#undef WITHZFS
#define WITHZFS 1
#else
#define WITHZFS 0
#endif
/* Defined in configure and passed in via the makefile */
#define DBNAME_SIZE 64
#define HOSTID_SIZE (32+64)
......@@ -4673,7 +4680,7 @@ COMMAND_PROTOTYPE(domounts)
/*
* A local phys node acting as a shared host gets toplevel mounts only.
*/
if (reqp->sharing_mode[0] && !reqp->isvnode) {
if (reqp->sharing_mode[0] && !reqp->isvnode && !WITHZFS) {
bufp = buf;
if (!nomounts)
bufp += OUTPUT(bufp, ebufp-bufp,
......
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