Commit adf23dc1 authored by Mike Hibler's avatar Mike Hibler
Browse files

Fix some prototype mismatches

parent 05103f79
...@@ -194,6 +194,8 @@ sub CreateDefsFile($); ...@@ -194,6 +194,8 @@ sub CreateDefsFile($);
sub SetupSendMail($$); sub SetupSendMail($$);
sub GetEmulabSource($); sub GetEmulabSource($);
sub MungeMfsRoot($); sub MungeMfsRoot($);
sub SetupTBDir($);
sub RecreateDir($$);
# #
# Boot Action. # Boot Action.
...@@ -255,6 +257,7 @@ sub doboot() ...@@ -255,6 +257,7 @@ sub doboot()
# #
$emulabconfig{"LOADPACKAGES"} = 0; $emulabconfig{"LOADPACKAGES"} = 0;
$emulabconfig{"LOADMFS"} = 0; $emulabconfig{"LOADMFS"} = 0;
$emulabconfig{"LOADELABSOURCE"} = 0;
# #
# XXX defaults for things that may or may not be passed in. # XXX defaults for things that may or may not be passed in.
...@@ -459,7 +462,7 @@ sub SetupFsNode() ...@@ -459,7 +462,7 @@ sub SetupFsNode()
# for ops+fs and fs-only nodes. # for ops+fs and fs-only nodes.
# #
if ($fromscratch) { if ($fromscratch) {
SetupTBDir($TBDIR, 1); SetupTBDir($TBDIR);
} }
$FSDIR = "/q"; $FSDIR = "/q";
RecreateDir("$FSDIR", 1); RecreateDir("$FSDIR", 1);
...@@ -845,7 +848,7 @@ sub SetupOpsNode($) ...@@ -845,7 +848,7 @@ sub SetupOpsNode($)
# for ops+fs and fs-only nodes. # for ops+fs and fs-only nodes.
# #
if ($fromscratch) { if ($fromscratch) {
SetupTBDir($TBDIR, 1); SetupTBDir($TBDIR);
} }
if ($isfs) { if ($isfs) {
$FSDIR = "/q"; $FSDIR = "/q";
...@@ -1252,7 +1255,7 @@ sub SetupBossNode() ...@@ -1252,7 +1255,7 @@ sub SetupBossNode()
# for the boss node. # for the boss node.
# #
if ($fromscratch) { if ($fromscratch) {
SetupTBDir($TBDIR, 1); SetupTBDir($TBDIR);
} }
RecreateDir("$TBDIR/data", 1); RecreateDir("$TBDIR/data", 1);
mysystem("$BINDIR/mkextrafs.pl -f $TBDIR/data"); mysystem("$BINDIR/mkextrafs.pl -f $TBDIR/data");
...@@ -2129,9 +2132,10 @@ sub GetEmulabSource($) ...@@ -2129,9 +2132,10 @@ sub GetEmulabSource($)
my ($destdir) = @_; my ($destdir) = @_;
# #
# Remove any pre-existing installed src/obj trees # 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 # Look to see if the source code is already here (say, cause the user
...@@ -2171,7 +2175,7 @@ sub SetupTBDir($) ...@@ -2171,7 +2175,7 @@ sub SetupTBDir($)
{ {
my ($TBDIR) = @_; my ($TBDIR) = @_;
RecreateDir($TBDIR); RecreateDir($TBDIR, 1);
mysystem("$BINDIR/mkextrafs.pl -s 2 -f $TBDIR"); mysystem("$BINDIR/mkextrafs.pl -s 2 -f $TBDIR");
mysystem("mkdir $TBDIR/src $TBDIR/obj"); mysystem("mkdir $TBDIR/src $TBDIR/obj");
} }
......
Supports Markdown
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