Commit a05f6b11 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Add temp paths for 6.0 packages.

parent 798c7580
...@@ -254,6 +254,14 @@ sub doboot() ...@@ -254,6 +254,14 @@ sub doboot()
$emulabconfig{OPS_PKG} = "emulab-ops-2.0"; $emulabconfig{OPS_PKG} = "emulab-ops-2.0";
$emulabconfig{BOSS_PKG} = "emulab-boss-2.0"; $emulabconfig{BOSS_PKG} = "emulab-boss-2.0";
} }
elsif ($FBSD_VERSION == 6) {
$emulabconfig{FS_PKG_DIR} = "/share/freebsd/6.0/packages";
$emulabconfig{OPS_PKG_DIR} = "/share/freebsd/6.0/packages";
$emulabconfig{BOSS_PKG_DIR} = "/share/freebsd/6.0/packages";
$emulabconfig{FS_PKG} = "emulab-fs-2.0";
$emulabconfig{OPS_PKG} = "emulab-ops-2.0";
$emulabconfig{BOSS_PKG} = "emulab-boss-2.0";
}
if ($emulabconfig{"ROLE"} eq "fs") { if ($emulabconfig{"ROLE"} eq "fs") {
SetupFsNode(); SetupFsNode();
...@@ -287,12 +295,6 @@ sub SetupFsNode() ...@@ -287,12 +295,6 @@ sub SetupFsNode()
if ($os ne "FreeBSD") { if ($os ne "FreeBSD") {
SetupFatal("FS node must run FreeBSD\n"); SetupFatal("FS node must run FreeBSD\n");
} }
# XXXX brutal!
if ($FBSD_VERSION == 5) {
$emulabconfig{FS_PKG_DIR} =
"/share/freebsd/packages/FreeBSD-5.4-20050508";
($emulabconfig{FS_PKG} = $emulabconfig{OPS_PKG}) =~ s/ops/fs/;
}
# #
# Create a ${TBDIR} from the extra slice and put everything there. # Create a ${TBDIR} from the extra slice and put everything there.
......
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