Commit 2a921ff8 authored by Mike Hibler's avatar Mike Hibler

Checkpoint: makes it most of the way through boss-install

parent a1e2eee7
......@@ -39,7 +39,7 @@ BUGDBSUPPORT=changeme
MAILMANSUPPORT=changeme
OPSDBSUPPORT=changeme
WINSUPPORT=0
NSVERIFY=1
NSVERIFY=changeme
SFSSUPPORT=0
CVSSUPPORT=changeme
NFSTRACESUPPORT=0
......
......@@ -1017,7 +1017,7 @@ Phase "NFSmounts", "Setting up NFS mounts", sub {
DoneIfEdited($FSTAB);
my $nfsopt = "nosuid";
$nfsopt .= ",nodev"
if ($FBSD_VERSION < 7);
if ($FBSD_MAJOR < 7);
my @lines = ("$FSNODE:$USERROOT\t\t$USERROOT\tnfs\trw,$nfsopt\t0\t0",
"$FSNODE:$PROJROOT\t\t$PROJROOT\tnfs\trw,$nfsopt\t0\t0",
"$FSNODE:$GROUPROOT\t\t$GROUPROOT\tnfs\trw,$nfsopt\t0\t0",
......
......@@ -381,7 +381,7 @@ Phase "ports", "Installing ports", sub {
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $pname");
};
# XXX Ditto
if ($FBSD_MAJOR == 6 && $FBSD_MINOR > 2) {
if ($FBSD_MAJOR > 6 || ($FBSD_MAJOR == 6 && $FBSD_MINOR > 2)) {
Phase "p5-DBD-mysql50", "Installing old Perl Mysql package", sub {
my $pname = `$PKG_INFO -E 'p5-DBD-mysql50-*' 2>/dev/null`;
chomp($pname);
......@@ -582,6 +582,14 @@ Phase "rc.conf", "Adding testbed content to rc.conf", sub {
Phase "hosts", "Adding boss/ops/fs IP addresses to $HOSTS", sub {
DoneIfEdited($HOSTS);
# XXX get rid of any existing lines with boss/ops/fs
if ($ELABINELAB) {
my $dellist = "-e '/^${BOSSNODE_IP}/d' -e '/^${USERNODE_IP}/d'";
if (!$ISFS) {
$dellist .= " -e '/^${FSNODE_IP}/d'";
}
ExecQuietFatal("sed -i.orig $dellist $HOSTS");
}
my $hstr = "${BOSSNODE_IP}\t${BOSSNODE} boss" .
"\n${USERNODE_IP}\t@OPS_NAMES";
if (!$ISFS) {
......
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