Skip to content
GitLab
Menu
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
adf23dc1
Commit
adf23dc1
authored
Mar 17, 2010
by
Mike Hibler
Browse files
Fix some prototype mismatches
parent
05103f79
Changes
1
Show whitespace changes
Inline
Side-by-side
tmcd/common/config/rc.mkelab
View file @
adf23dc1
...
...
@@ -194,6 +194,8 @@ sub CreateDefsFile($);
sub
SetupSendMail
($$);
sub
GetEmulabSource
($);
sub
MungeMfsRoot
($);
sub
SetupTBDir
($);
sub
RecreateDir
($$);
#
# Boot Action.
...
...
@@ -255,6 +257,7 @@ sub doboot()
#
$emulabconfig
{"
LOADPACKAGES
"}
=
0
;
$emulabconfig
{"
LOADMFS
"}
=
0
;
$emulabconfig
{"
LOADELABSOURCE
"}
=
0
;
#
# XXX defaults for things that may or may not be passed in.
...
...
@@ -459,7 +462,7 @@ sub SetupFsNode()
# for ops+fs and fs-only nodes.
#
if
(
$fromscratch
)
{
SetupTBDir
(
$TBDIR
,
1
);
SetupTBDir
(
$TBDIR
);
}
$FSDIR
=
"
/q
";
RecreateDir
("
$FSDIR
",
1
);
...
...
@@ -845,7 +848,7 @@ sub SetupOpsNode($)
# for ops+fs and fs-only nodes.
#
if
(
$fromscratch
)
{
SetupTBDir
(
$TBDIR
,
1
);
SetupTBDir
(
$TBDIR
);
}
if
(
$isfs
)
{
$FSDIR
=
"
/q
";
...
...
@@ -1252,7 +1255,7 @@ sub SetupBossNode()
# for the boss node.
#
if
(
$fromscratch
)
{
SetupTBDir
(
$TBDIR
,
1
);
SetupTBDir
(
$TBDIR
);
}
RecreateDir
("
$TBDIR
/data
",
1
);
mysystem
("
$BINDIR
/mkextrafs.pl -f
$TBDIR
/data
");
...
...
@@ -2129,9 +2132,10 @@ sub GetEmulabSource($)
my
(
$destdir
)
=
@_
;
#
# Remove any pre-existing installed src
/obj
tree
s
# Remove any pre-existing installed src tree
#
RecreateDir
("
$destdir
/testbed
");
RecreateDir
("
$destdir
",
1
);
mysystem
("
mkdir
$destdir
/testbed
");
#
# Look to see if the source code is already here (say, cause the user
...
...
@@ -2171,7 +2175,7 @@ sub SetupTBDir($)
{
my
(
$TBDIR
)
=
@_
;
RecreateDir
(
$TBDIR
);
RecreateDir
(
$TBDIR
,
1
);
mysystem
("
$BINDIR
/mkextrafs.pl -s 2 -f
$TBDIR
");
mysystem
("
mkdir
$TBDIR
/src
$TBDIR
/obj
");
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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