Commit 08a1d578 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Install the protogeni libs to avoid missing library errors.

parent 5684f224
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group. # Copyright (c) 2000-2008 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
# Testbed Makefile # Testbed Makefile
...@@ -31,7 +31,7 @@ include Makeconf ...@@ -31,7 +31,7 @@ include Makeconf
SUBDIRS = lib db assign www @optional_subdirs@ ipod security sensors \ SUBDIRS = lib db assign www @optional_subdirs@ ipod security sensors \
pxe tbsetup account tmcd utils backend tip capture ipod vis \ pxe tbsetup account tmcd utils backend tip capture ipod vis \
sensors os xmlrpc install/newnode_sshkeys mote tools/whol \ sensors os xmlrpc install/newnode_sshkeys mote tools/whol \
tools/svn wiki bugdb collab tools/rmanage tools/svn wiki bugdb collab tools/rmanage protogeni/lib
all: all-subdirs all: all-subdirs
......
...@@ -62,6 +62,7 @@ use libtestbed; ...@@ -62,6 +62,7 @@ use libtestbed;
use libtblog; use libtblog;
use Experiment; use Experiment;
use Node; use Node;
use GeniEmulab;
# un-taint path # un-taint path
$ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
...@@ -148,12 +149,6 @@ if (!defined($experiment)) { ...@@ -148,12 +149,6 @@ if (!defined($experiment)) {
tbdie("Could not locate object for experiment $pid/$eid"); 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 # Verify permission to muck with this experiment. Note that this script
# is run as root from the plab monitor daemon. # is run as root from the plab monitor daemon.
......
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