Commit 5205081b authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents dd4495d6 b1883be7
......@@ -1566,16 +1566,21 @@ sub Volunteers($)
package libossetup_protogeni;
use base qw(libossetup_handler);
my $PGENISUPPORT= @PROTOGENI_SUPPORT@;
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libGeni;
use Node;
use English;
use Data::Dumper;
use overload ('""' => 'Stringify');
if ($PGENISUPPORT) {
require libGeni;
}
sub New($$) {
my ($class, $parent) = @_;
......
......@@ -37,7 +37,6 @@ my $impotent = 0;
#
my $TB = "@prefix@";
my $TBOPS = "@TBOPSEMAIL@";
my $PGENISUPPORT= @PROTOGENI_SUPPORT@;
# un-taint path
$ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
......
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