Commit a69f61fd authored by Leigh Stoller's avatar Leigh Stoller

Add NOVIRTNFSMOUNTS to turn off NFSmounts to shared virt nodes.

parent e766d651
...@@ -64,3 +64,5 @@ ...@@ -64,3 +64,5 @@
#undef IMAGEPROVENANCE #undef IMAGEPROVENANCE
#undef IMAGEDELTAS #undef IMAGEDELTAS
#undef NOVIRTNFSMOUNTS
...@@ -660,6 +660,7 @@ IPV6_SUBNET_PREFIX ...@@ -660,6 +660,7 @@ IPV6_SUBNET_PREFIX
IPV6_ENABLED IPV6_ENABLED
NFSMAPTOUSER NFSMAPTOUSER
IMAGEPROVENANCE IMAGEPROVENANCE
NOVIRTNFSMOUNTS
IMAGEDELTAS IMAGEDELTAS
PROFILEVERSIONS PROFILEVERSIONS
BROWSER_CONSOLE_ENABLE BROWSER_CONSOLE_ENABLE
...@@ -5097,6 +5098,7 @@ NFSMAPTOUSER="root" ...@@ -5097,6 +5098,7 @@ NFSMAPTOUSER="root"
IMAGEPROVENANCE=0 IMAGEPROVENANCE=0
IMAGEDELTAS=0 IMAGEDELTAS=0
PROFILEVERSIONS=0 PROFILEVERSIONS=0
NOVIRTNFSMOUNTS=0;
# #
# XXX You really don't want to change these! # XXX You really don't want to change these!
...@@ -5477,6 +5479,12 @@ if test $IMAGEDELTAS -eq 1; then ...@@ -5477,6 +5479,12 @@ if test $IMAGEDELTAS -eq 1; then
#define IMAGEDELTAS 1 #define IMAGEDELTAS 1
_ACEOF _ACEOF
fi
if test $NOVIRTNFSMOUNTS -eq 1; then
cat >>confdefs.h <<_ACEOF
#define NOVIRTNFSMOUNTS 1
_ACEOF
fi fi
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define IMPORT_TMPDIR "$IMPORT_TMPDIR" #define IMPORT_TMPDIR "$IMPORT_TMPDIR"
......
...@@ -294,6 +294,7 @@ AC_SUBST(NFSMAPTOUSER) ...@@ -294,6 +294,7 @@ AC_SUBST(NFSMAPTOUSER)
AC_SUBST(IMAGEPROVENANCE) AC_SUBST(IMAGEPROVENANCE)
AC_SUBST(IMAGEDELTAS) AC_SUBST(IMAGEDELTAS)
AC_SUBST(PROFILEVERSIONS) AC_SUBST(PROFILEVERSIONS)
AC_SUBST(NOVIRTNFSMOUNTS)
# #
# Offer both versions of the email addresses that have the @ escaped # Offer both versions of the email addresses that have the @ escaped
...@@ -439,6 +440,7 @@ NFSMAPTOUSER="root" ...@@ -439,6 +440,7 @@ NFSMAPTOUSER="root"
IMAGEPROVENANCE=0 IMAGEPROVENANCE=0
IMAGEDELTAS=0 IMAGEDELTAS=0
PROFILEVERSIONS=0 PROFILEVERSIONS=0
NOVIRTNFSMOUNTS=0
# #
# XXX You really don't want to change these! # XXX You really don't want to change these!
...@@ -639,6 +641,9 @@ fi ...@@ -639,6 +641,9 @@ fi
if test $IMAGEDELTAS -eq 1; then if test $IMAGEDELTAS -eq 1; then
AC_DEFINE_UNQUOTED(IMAGEDELTAS, 1) AC_DEFINE_UNQUOTED(IMAGEDELTAS, 1)
fi fi
if test $NOVIRTNFSMOUNTS -eq 1; then
AC_DEFINE_UNQUOTED(NOVIRTNFSMOUNTS=0, 1)
fi
AC_DEFINE_UNQUOTED(IMPORT_TMPDIR, "$IMPORT_TMPDIR") AC_DEFINE_UNQUOTED(IMPORT_TMPDIR, "$IMPORT_TMPDIR")
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z` LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
......
...@@ -129,3 +129,4 @@ EC2META_ENABLE=1 ...@@ -129,3 +129,4 @@ EC2META_ENABLE=1
# Fancy new browser in the console support # Fancy new browser in the console support
# #
BROWSER_CONSOLE_ENABLE=1 BROWSER_CONSOLE_ENABLE=1
NOVIRTNFSMOUNTS=1
...@@ -161,3 +161,7 @@ WINDOWS_KEY_7PRO_X86="" ...@@ -161,3 +161,7 @@ WINDOWS_KEY_7PRO_X86=""
# Fancy new browser in the console support # Fancy new browser in the console support
# #
BROWSER_CONSOLE_ENABLE=1 BROWSER_CONSOLE_ENABLE=1
# Image versioning and deltas.
IMAGEPROVENANCE=1
IMAGEDELTAS=1
...@@ -4664,6 +4664,11 @@ COMMAND_PROTOTYPE(domounts) ...@@ -4664,6 +4664,11 @@ COMMAND_PROTOTYPE(domounts)
OUTPUT(buf, sizeof(buf), "FSTYPE=%s\n", fstype); OUTPUT(buf, sizeof(buf), "FSTYPE=%s\n", fstype);
client_writeback(sock, buf, strlen(buf), tcp); client_writeback(sock, buf, strlen(buf), tcp);
} }
#ifdef NOVIRTNFSMOUNTS
if (reqp->sharing_mode[0] && reqp->isvnode) {
return 0;
}
#endif
/* /*
* A local phys node acting as a shared host gets toplevel mounts only. * A local phys node acting as a shared host gets toplevel mounts only.
......
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