Commit 43efbee5 authored by Mike Hibler's avatar Mike Hibler

Put overrides of emulabconfig variables in the correct place.

parent adf23dc1
......@@ -224,41 +224,6 @@ sub doboot()
STDERR->autoflush(1);
}
#
# Elabinelab build options:
#
# LOADPACKAGES download and install a standard set of packages,
# otherwise assume they are already installed.
# LOADMFS download and install a tftpboot tarball,
# otherwise assume it is already installed.
# LOADELABSOURCE download, build and install the Emulab source code,
# otherwise assume it is already installed.
# LOADDB download and install Emulab DB state,
# otherwise...this might not even be useful.
# LOADUSERDIRS download and install "user data" whatever we
# decide that might be.
#
# Defaults to all *but* LOADUSERDIRS for backward compat.
#
$emulabconfig{"LOADPACKAGES"} = 1
if (!defined($emulabconfig{"LOADPACKAGES"}));
$emulabconfig{"LOADMFS"} = 1
if (!defined($emulabconfig{"LOADMFS"}));
$emulabconfig{"LOADELABSOURCE"} = 1
if (!defined($emulabconfig{"BUILDSOURCE"}));
$emulabconfig{"LOADDB"} = 1
if (!defined($emulabconfig{"LOADDB"}));
# XXX not yet
$emulabconfig{"LOADUSERDIRS"} = 0
if (!defined($emulabconfig{"LOADUSERDIRS"}));
#
# XXX Mike's transitional vesion while I debug things
#
$emulabconfig{"LOADPACKAGES"} = 0;
$emulabconfig{"LOADMFS"} = 0;
$emulabconfig{"LOADELABSOURCE"} = 0;
#
# XXX defaults for things that may or may not be passed in.
# Will be overridden if values are actually passed in.
......@@ -282,6 +247,29 @@ $emulabconfig{"LOADELABSOURCE"} = 0;
$emulabconfig{"ELVIN_COMPAT"} = 0;
}
#
# Elabinelab build options:
#
# LOADPACKAGES download and install a standard set of packages,
# otherwise assume they are already installed.
# LOADMFS download and install a tftpboot tarball,
# otherwise assume it is already installed.
# LOADELABSOURCE download, build and install the Emulab source code,
# otherwise assume it is already installed.
# LOADDB download and install Emulab DB state,
# otherwise...this might not even be useful.
# LOADUSERDIRS download and install "user data" whatever we
# decide that might be.
#
# Defaults to all *but* LOADUSERDIRS for backward compat.
#
$emulabconfig{"LOADPACKAGES"} = 1;
$emulabconfig{"LOADMFS"} = 1;
$emulabconfig{"LOADELABSOURCE"} = 1;
$emulabconfig{"LOADDB"} = 1;
# XXX not yet
$emulabconfig{"LOADUSERDIRS"} = 0;
#
# Need outer control router IP in lots of places.
#
......@@ -310,11 +298,19 @@ $emulabconfig{"LOADELABSOURCE"} = 0;
}
#
# XXX temporary backward compat til this get implemented
# XXX temporary backward compat til this gets implemented
#
$emulabconfig{"ROLE"} = "boss"
if ($emulabconfig{"ROLE"} eq "boss+router");
#
# XXX Mike's transitional vesion while I debug things
#
$emulabconfig{"LOADPACKAGES"} = 0;
$emulabconfig{"LOADMFS"} = 0;
$emulabconfig{"LOADELABSOURCE"} = 0;
#
# XXX To avoid NFS errors while copying goo from outer boss.
#
......
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