From 8f598e53e91428c42573c4cd20f9298631a1e921 Mon Sep 17 00:00:00 2001 From: Mike Hibler Date: Thu, 31 Jul 2008 00:11:49 +0000 Subject: [PATCH] use new packages for 6.3 install --- tmcd/common/config/rc.mkelab | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tmcd/common/config/rc.mkelab b/tmcd/common/config/rc.mkelab index f823e85a6..7a5eda70f 100755 --- a/tmcd/common/config/rc.mkelab +++ b/tmcd/common/config/rc.mkelab @@ -319,8 +319,7 @@ sub doboot() $emulabconfig{BOSS_PKG} = "emulab-boss-2.0"; } elsif ($FBSD_VERSION == 6.1 || - $FBSD_VERSION == 6.2 || - $FBSD_VERSION == 6.3) { + $FBSD_VERSION == 6.2) { if ($ELVIN_COMPAT) { $emulabconfig{FS_PKG_DIR} = "/share/freebsd/6.1/packages.elvincompat"; } else { @@ -332,6 +331,18 @@ sub doboot() $emulabconfig{OPS_PKG} = "emulab-ops-2.0"; $emulabconfig{BOSS_PKG} = "emulab-boss-2.0"; } + elsif ($FBSD_VERSION == 6.3) { + if ($ELVIN_COMPAT) { + $emulabconfig{FS_PKG_DIR} = "/share/freebsd/6.3/packages.elvincompat"; + } else { + $emulabconfig{FS_PKG_DIR} = "/share/freebsd/6.3/packages"; + } + $emulabconfig{OPS_PKG_DIR} = $emulabconfig{FS_PKG_DIR}; + $emulabconfig{BOSS_PKG_DIR} = $emulabconfig{FS_PKG_DIR}; + $emulabconfig{FS_PKG} = "emulab-fs-2.1"; + $emulabconfig{OPS_PKG} = "emulab-ops-2.1"; + $emulabconfig{BOSS_PKG} = "emulab-boss-2.1"; + } # Figure out where /share is coming from (outer fs node). We need # that below. -- GitLab