From c52a4ff52788fa248f7187aaf03f1b3ba6ec7abe Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Mon, 8 Sep 2008 21:49:28 +0000
Subject: [PATCH] Import Geni libs only if experiment has geni nodes, at least
 until geni code ready for primetime.

---
 tbsetup/vnode_setup.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tbsetup/vnode_setup.in b/tbsetup/vnode_setup.in
index af38e3b10..e4e01ea9d 100644
--- a/tbsetup/vnode_setup.in
+++ b/tbsetup/vnode_setup.in
@@ -62,7 +62,6 @@ use libtestbed;
 use libtblog;
 use Experiment;
 use Node;
-use GeniEmulab;
 
 # un-taint path
 $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
@@ -149,6 +148,12 @@ if (!defined($experiment)) {
     tbdie("Could not locate object for experiment $pid/$eid");
 }
 
+# XXX Until ProtoGeni stuff more ready for primetime.
+if ($experiment->HasGeniNodes()) {
+    require GeniEmulab;
+    import GeniEmulab;
+}
+
 #
 # Verify permission to muck with this experiment. Note that this script
 # is run as root from the plab monitor daemon.
-- 
GitLab