Commit 38efff24 authored by Leigh B Stoller's avatar Leigh B Stoller

Symlink /usr/ports to /usr/testbed/ports cause we put the ports

tree, cause /usr is kinda small.

Munge the defs file so that WWWHOST=www instead of boss; we do
this on elabinelab cause there are no CNAMES for www, but there
will be a www CNAME on the racks.

Minor fixes to how we invoke mknewconfig.
parent 8ac35390
......@@ -226,6 +226,11 @@ sub Install($$$)
DoneIfExists("$PREFIX/ports/Mk");
ExecQuietFatal("cd $PREFIX; $TAR zxf $PREFIX/ports.tar.gz");
};
Phase "portlink", "Linking to unpacked ports tree", sub {
ExecQuietFatal("cd /usr; ln -sf testbed/ports .");
}
# Need to add a symlink.
#
# Need to remove the ELABINELAB flag.
......@@ -233,10 +238,11 @@ sub Install($$$)
my $OLDDEFSFILE = "$main::TOP_SRCDIR/defs-elabinelab";
my $NEWDEFSFILE = "$main::TOP_SRCDIR/defs-genirack";
Phase "elabinelab", "Removing ELABINELAB from defs file", sub {
Phase "elabinelab", "Removing ELABINELAB stuff from defs file", sub {
DoneIfExists($NEWDEFSFILE);
ExecQuietFatal("cat $OLDDEFSFILE | ".
" sed -e 's/^ELABINELAB/#ELABINELAB/' ".
ExecQuietFatal("cat $OLDDEFSFILE | sed ".
" -e 's/^ELABINELAB/#ELABINELAB/' ".
" -e 's/^WWWHOST=boss/WWWHOST=www/' ".
" > $NEWDEFSFILE");
};
......@@ -357,8 +363,8 @@ sub Install($$$)
ExecQuietFatal("cd $TOP_OBJDIR/install/genirack; ".
" $SUDO -u $PROTOUSER $WAP ".
" perl mknewconfig output ".
" $RACKIPS $RACKILO $RACKWIRES");
" perl mknewconfig ".
" /tmp/output $RACKIPS $RACKILO $RACKWIRES");
};
Phase "outlets", "Adding outlets to the DB", sub {
......
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