All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 207f55e3 authored by Mike Hibler's avatar Mike Hibler

Missed a couple of changes to support 11.2 elabinelab.

Also add partial support for 11.2 MFS (just kernel right now,
binaries are still 10.3).
parent e992c59d
......@@ -678,8 +678,8 @@ sub doboot()
$emulabconfig{EXTRA_PKG} = "emulab-extras-6.3";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-10.3-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-6.3";
} elsif ($FBSD_VERSION >= 11.0) {
my $suf = ($FBSD_ARCH eq "amd64") ? "-64" : "";
} elsif ($FBSD_VERSION <= 11.1) {
my $suf = "-64";
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/11.1/packages${suf}";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
......@@ -690,6 +690,18 @@ sub doboot()
$emulabconfig{EXTRA_PKG} = "emulab-extras-7.1";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-11.1-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-7.1";
} elsif ($FBSD_VERSION >= 11.2) {
my $suf = "-64";
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/11.2/packages${suf}";
$emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR};
$emulabconfig{EXTRA_PKG_DIR}= $emulabconfig{FS_PKG_DIR};
$emulabconfig{FS_PKG} = "emulab-fs-7.2";
$emulabconfig{OPS_PKG} = "emulab-ops-7.2";
$emulabconfig{BOSS_PKG} = "emulab-boss-7.2";
$emulabconfig{EXTRA_PKG} = "emulab-extras-7.2";
$emulabconfig{PACKAGE_TARBALL} = "FreeBSD-11.2-packages${suf}.tar.gz";
$emulabconfig{PGENI_PKG} = "emulab-protogeni-7.2";
}
#
# If there is a package tarball, prefer that and grab it now.
......
......@@ -85,6 +85,19 @@ sub Install($$$)
# Its the generic stuff; must localize.
#
my $fv = $MFSVERSION;
#
# XXX hack, hack. Right now there is no FreeBSD 11 MFS,
# just a FreeBSD 11 kernel to use with FreeBSD 10 MFS.
#
if ($fv eq "11-64") {
$fv = "10-64";
if (-x "$TFTP_DIR/freebsd/boot/kernel11" ||
-x "$TFTP_DIR/freebsd10-64/boot/kernel11") {
$kernelvers = 11;
}
}
if (! -e "$TFTP_DIR/freebsd${fv}") {
if ($fv eq "10-64") {
$fv = "8-64";
......
......@@ -37,7 +37,7 @@ sub usage()
print(" 'vga', 'sio', 'sio2', 'sio3', 'sio4', 'null'\n");
print(" NOTE: not needed with newer MFS setups\n");
print(" -F version Set kernel version used in a FreeBSD MFS:\n");
print(" One of: '8', '9', or '10'\n");
print(" One of: '8', '9', '10', or '11'\n");
print(" Only applies to FreeBSD MFSes (duh!)\n");
exit(-1);
}
......@@ -125,7 +125,7 @@ if (defined($options{"c"})) {
}
if (defined($options{"F"})) {
$FBSDKERNEL = $options{"F"};
if ($FBSDKERNEL !~ /^(8|9|10)$/) {
if ($FBSDKERNEL !~ /^(8|9|10|11)$/) {
fatal("Invalid FreeBSD kernel version '$FBSDKERNEL'");
}
}
......
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