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
15cbcf89
Commit
15cbcf89
authored
Apr 13, 2011
by
Leigh B Stoller
Browse files
Bug Fix: little bits of bitrot in the ProtoGeni setup path.
parent
4aa63b4f
Changes
4
Hide whitespace changes
Inline
Side-by-side
protogeni/etc/protogeni.sql
View file @
15cbcf89
...
...
@@ -218,7 +218,7 @@ CREATE TABLE `geni_rspecs` (
`idx`
int
(
10
)
unsigned
NOT
NULL
auto_increment
,
`created`
datetime
default
NULL
,
`rspec`
text
,
PRIMARY
KEY
(
`idx`
)
,
PRIMARY
KEY
(
`idx`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin1
;
DROP
TABLE
IF
EXISTS
`geni_bindings`
;
...
...
protogeni/scripts/initsite.in
View file @
15cbcf89
#!/usr/bin/perl -w
#
# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-201
0
University of Utah and the Flux Group.
# Copyright (c) 2008-201
1
University of Utah and the Flux Group.
# All rights reserved.
#
use
strict
;
...
...
@@ -203,7 +203,8 @@ my %packlist =
"
p5-Crypt-SSLeay>=0.57
"
=>
"
/usr/ports/security/p5-Crypt-SSLeay
",
"
p5-Crypt-OpenSSL-X509
"
=>
"
/usr/ports/security/p5-Crypt-OpenSSL-X509
",
"
p5-Crypt-X509
"
=>
"
/usr/ports/security/p5-Crypt-X509
",
"
xerces-c2>=2.7.0
"
=>
"
/usr/ports/textproc/xerces-c2
"
"
xerces-c2>=2.7.0
"
=>
"
/usr/ports/textproc/xerces-c2
",
"
p5-XML-SemanticDiff
"
=>
"
/usr/ports/textproc/p5-XML-SemanticDiff
",
);
my
$needpkgs
=
0
;
...
...
protogeni/scripts/register_resources.in
View file @
15cbcf89
#!/usr/bin/perl -w
#
# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-201
0
University of Utah and the Flux Group.
# Copyright (c) 2008-201
1
University of Utah and the Flux Group.
# All rights reserved.
#
use
strict
;
...
...
@@ -48,6 +48,7 @@ $GENI_DBNAME = "geni-cm";
use
lib
'
@prefix@/lib
';
use
libdb
qw(DBQueryFatal)
;
use
Node
;
use
User
;
require
GeniDB
;
require
GeniCertificate
;
require
GeniComponent
;
...
...
protogeni/scripts/update.in
View file @
15cbcf89
...
...
@@ -38,6 +38,7 @@ my $CMCERT = "$TB/etc/genicm.pem";
my
$geniuserid
=
"
geniuser
";
my
$geniprojid
=
"
GeniSlices
";
my
$SUDO
=
"
/usr/local/bin/sudo
";
my
$MYSQLSHOW
=
"
/usr/X11R6/bin/mysqlshow
";
my
$BATCHEXP
=
"
$TB
/bin/batchexp
";
# un-taint path
...
...
@@ -68,8 +69,6 @@ BEGIN
use
libtestbed
;
use
libdb
qw(TBSetSiteVar TBSiteVarExists TBGetSiteVar)
;
use
Experiment
;
use
GeniDB
;
use
GeniCertificate
;
#
# Check args.
...
...
@@ -97,16 +96,25 @@ if (defined($options{"p"})) {
usage
()
if
(
@ARGV
);
OneShot
()
if
(
!
$verify
);
if
(
!
$verify
&&
$UID
!=
0
)
{
fatal
("
Must be root to run this script
\n
");
}
#
# Apply the dbupdates using the Emulab utility, to all three DBs.
# If the DBs are not built yet (initsite not run) just exit.
# We will be back here later.
#
system
("
$MYSQLSHOW
geni >/dev/null 2>&1
");
if
(
$?
)
{
print
"
Protogeni DB does not exist yet. Skipping ...
\n
";
exit
(
0
);
}
require
GeniDB
;
require
GeniCertificate
;
OneShot
()
if
(
!
$verify
);
#
# Apply the dbupdates using the Emulab utility, to all three DBs.
#
...
...
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