Add NOVIRTNFSMOUNTS to turn off NFSmounts to shared virt nodes.

config.h.in

@@ -64,3 +64,5 @@
 
 #undef IMAGEPROVENANCE
 #undef IMAGEDELTAS
+
+#undef NOVIRTNFSMOUNTS

configure

@@ -660,6 +660,7 @@ IPV6_SUBNET_PREFIX
 IPV6_ENABLED
 NFSMAPTOUSER
 IMAGEPROVENANCE
+NOVIRTNFSMOUNTS
 IMAGEDELTAS
 PROFILEVERSIONS
 BROWSER_CONSOLE_ENABLE
@@ -5097,6 +5098,7 @@ NFSMAPTOUSER="root"
 IMAGEPROVENANCE=0
 IMAGEDELTAS=0
 PROFILEVERSIONS=0
+NOVIRTNFSMOUNTS=0;
 
 #
 # XXX You really don't want to change these!
@@ -5477,6 +5479,12 @@ if test $IMAGEDELTAS -eq 1; then
 #define IMAGEDELTAS 1
 _ACEOF
 
+fi
+if test $NOVIRTNFSMOUNTS -eq 1; then
+    cat >>confdefs.h <<_ACEOF
+#define NOVIRTNFSMOUNTS 1
+_ACEOF
+
 fi
 cat >>confdefs.h <<_ACEOF
 #define IMPORT_TMPDIR "$IMPORT_TMPDIR"

configure.in

@@ -294,6 +294,7 @@ AC_SUBST(NFSMAPTOUSER)
 AC_SUBST(IMAGEPROVENANCE)
 AC_SUBST(IMAGEDELTAS)
 AC_SUBST(PROFILEVERSIONS)
+AC_SUBST(NOVIRTNFSMOUNTS)
 
 #
 # Offer both versions of the email addresses that have the @ escaped
@@ -439,6 +440,7 @@ NFSMAPTOUSER="root"
 IMAGEPROVENANCE=0
 IMAGEDELTAS=0
 PROFILEVERSIONS=0
+NOVIRTNFSMOUNTS=0
 
 #
 # XXX You really don't want to change these!
@@ -639,6 +641,9 @@ fi
 if test $IMAGEDELTAS -eq 1; then
     AC_DEFINE_UNQUOTED(IMAGEDELTAS, 1)
 fi
+if test $NOVIRTNFSMOUNTS -eq 1; then
+    AC_DEFINE_UNQUOTED(NOVIRTNFSMOUNTS=0, 1)
+fi
 AC_DEFINE_UNQUOTED(IMPORT_TMPDIR, "$IMPORT_TMPDIR")
 
 LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`

defs-apt

@@ -129,3 +129,4 @@ EC2META_ENABLE=1
 # Fancy new browser in the console support
 #
 BROWSER_CONSOLE_ENABLE=1
+NOVIRTNFSMOUNTS=1

defs-default

@@ -161,3 +161,7 @@ WINDOWS_KEY_7PRO_X86=""
 # Fancy new browser in the console support
 #
 BROWSER_CONSOLE_ENABLE=1
+
+# Image versioning and deltas.
+IMAGEPROVENANCE=1
+IMAGEDELTAS=1

tmcd/tmcd.c

@@ -4664,6 +4664,11 @@ COMMAND_PROTOTYPE(domounts)
 		OUTPUT(buf, sizeof(buf), "FSTYPE=%s\n", fstype);
 		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.