Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
5205081b
Commit
5205081b
authored
Jun 09, 2010
by
Leigh B Stoller
Browse files
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
parents
dd4495d6
b1883be7
Changes
2
Hide whitespace changes
Inline
Side-by-side
tbsetup/libossetup.pm.in
View file @
5205081b
...
...
@@ -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) = @_;
...
...
tbsetup/os_setup_new.in
View file @
5205081b
...
...
@@ -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
';
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment