From 76d7f1493211b61f12e4c54dcc7fd52bd8fadaf2 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Tue, 9 Aug 2011 10:38:15 -0600
Subject: [PATCH] Add new definitions for OPS as a VM (jail) on boss.

    OPSVM_ENABLE=0
    OPSVM_MOUNTPOINT=""
---
 Makeconf.in  |  2 ++
 config.h.in  |  2 ++
 configure    | 21 +++++++++++++++++++++
 configure.in | 10 ++++++++++
 4 files changed, 35 insertions(+)

diff --git a/Makeconf.in b/Makeconf.in
index 5f8be28116..29b4ccf2c3 100644
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -84,6 +84,8 @@ HAVE_MEZZANINE	= @HAVE_MEZZANINE@
 GTK_CONFIG	= @GTK_CONFIG@
 BRAINSTEM_DIR	= @BRAINSTEM_DIR@
 WITH_EMULAB     = @WITH_EMULAB@
+OPSVM_ENABLE    = @OPSVM_ENABLE@
+OPSVM_MOUNTPOINT= @OPSVM_MOUNTPOINT@
 
 host_cpu	= @host_cpu@
 
diff --git a/config.h.in b/config.h.in
index a5e7650e1e..a689989502 100644
--- a/config.h.in
+++ b/config.h.in
@@ -54,3 +54,5 @@
 
 #undef HAVE_LINUX_VIDEODEV_H
 #undef HAVE_MEZZANINE
+#undef OPSVM_ENABLE
+#undef OPSVM_MOUNTPOINT
diff --git a/configure b/configure
index c9a8fd4a2e..8c34886fd8 100755
--- a/configure
+++ b/configure
@@ -827,6 +827,8 @@ NOSHAREDFS
 SELFLOADER_DATA
 TBUSEDBI
 NEEDMROUTED
+OPSVM_ENABLE
+OPSVM_MOUNTPOINT
 TBOPSEMAIL
 TBOPSEMAIL_NOSLASH
 TBROBOCOPSEMAIL
@@ -4947,6 +4949,8 @@ done
 
 
 
+
+
 
 
 
@@ -5044,6 +5048,8 @@ NOSHAREDFS=0
 NFSRACY=1
 SELFLOADER_DATA="__DATA__"
 NEEDMROUTED=0
+OPSVM_ENABLE=0
+OPSVM_MOUNTPOINT="/ops"
 
 #
 # XXX You really don't want to change these!
@@ -5189,6 +5195,11 @@ elif test "$USERNODE" = "$FSNODE"; then
 #define FSNODE_IP "$USERNODE_IP"
 _ACEOF
 
+elif test "$BOSSNODE" = "$FSNODE"; then
+	cat >>confdefs.h <<_ACEOF
+#define FSNODE_IP "$BOSSNODE_IP"
+_ACEOF
+
 fi
 cat >>confdefs.h <<_ACEOF
 #define CONTROL_ROUTER_IP "$CONTROL_ROUTER_IP"
@@ -5313,6 +5324,16 @@ if test $NFSRACY -eq 1; then
 #define NFSRACY 1
 _ACEOF
 
+fi
+if test $OPSVM_ENABLE -eq 1; then
+    cat >>confdefs.h <<_ACEOF
+#define OPSVM_ENABLE 1
+_ACEOF
+
+    cat >>confdefs.h <<_ACEOF
+#define OPSVM_MOUNTPOINT $OPSVM_MOUNTPOINT
+_ACEOF
+
 fi
 
 LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
diff --git a/configure.in b/configure.in
index 4d668707a1..2c833eea0c 100755
--- a/configure.in
+++ b/configure.in
@@ -225,6 +225,8 @@ AC_SUBST(NOSHAREDFS)
 AC_SUBST(SELFLOADER_DATA)
 AC_SUBST(TBUSEDBI)
 AC_SUBST(NEEDMROUTED)
+AC_SUBST(OPSVM_ENABLE)
+AC_SUBST(OPSVM_MOUNTPOINT)
 
 #
 # Offer both versions of the email addresses that have the @ escaped
@@ -320,6 +322,8 @@ NOSHAREDFS=0
 NFSRACY=1
 SELFLOADER_DATA="__DATA__"
 NEEDMROUTED=0
+OPSVM_ENABLE=0
+OPSVM_MOUNTPOINT="/ops"
 
 #
 # XXX You really don't want to change these!
@@ -401,6 +405,8 @@ if test -n "$FSNODE_IP"; then
 	AC_DEFINE_UNQUOTED(FSNODE_IP, "$FSNODE_IP")
 elif test "$USERNODE" = "$FSNODE"; then
 	AC_DEFINE_UNQUOTED(FSNODE_IP, "$USERNODE_IP")
+elif test "$BOSSNODE" = "$FSNODE"; then
+	AC_DEFINE_UNQUOTED(FSNODE_IP, "$BOSSNODE_IP")
 fi
 AC_DEFINE_UNQUOTED(CONTROL_ROUTER_IP, "$CONTROL_ROUTER_IP")
 AC_DEFINE_UNQUOTED(CONTROL_NETWORK, "$CONTROL_NETWORK")
@@ -451,6 +457,10 @@ fi
 if test $NFSRACY -eq 1; then
     AC_DEFINE_UNQUOTED(NFSRACY, 1)
 fi
+if test $OPSVM_ENABLE -eq 1; then
+    AC_DEFINE_UNQUOTED(OPSVM_ENABLE, 1)
+    AC_DEFINE_UNQUOTED(OPSVM_MOUNTPOINT, $OPSVM_MOUNTPOINT)
+fi
 
 LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
 AC_DEFINE_UNQUOTED(LOG_TESTBED, $LOG_TESTBED)
-- 
GitLab