From 66aa173fe748b8c35b05b507b5f964cecb11fbb4 Mon Sep 17 00:00:00 2001
From: Jay Lepreau <lepreau@flux.utah.edu>
Date: Tue, 27 Aug 2002 02:58:10 +0000
Subject: [PATCH] Tweaks/reality treatment: Copyright, 4.3 -> 4.5 FreeBSD,
tip->console,...
---
www/doc/tmcd.html | 2 +-
www/faq.html | 2 +-
www/menu.php3 | 3 +--
www/software.html | 34 +++++++++++++++++++---------------
www/tutorial/advanced.html | 2 +-
www/tutorial/tutorial.html | 2 +-
6 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/www/doc/tmcd.html b/www/doc/tmcd.html
index b2b01525cb..be29ebbc8e 100644
--- a/www/doc/tmcd.html
+++ b/www/doc/tmcd.html
@@ -85,7 +85,7 @@ source code for the TMCC is available upon request by sending email to
<li> <a NAME="SETUP"></a>
<h3>Node Setup Script</h3>
-The Emulab versions of FreeBSD 4.3, Redhat Linux 7.1, and Netbsd 1.4
+The Emulab versions of FreeBSD 4.5, Redhat Linux 7.1, and Netbsd 1.4
all run a <i>setup</i> script at bootup that uses the TMCC client to
configure the node. All of the interfaces are configured, user
accounts for each of the members of the project are created, NFS
diff --git a/www/faq.html b/www/faq.html
index 4e2813e1af..a12911896a 100644
--- a/www/faq.html
+++ b/www/faq.html
@@ -663,7 +663,7 @@
difficult since you cannot specify them in your NS file. First
off, you should log into <tt>users.emulab.net</tt> and read the
man page for
- <a href='http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+4.3-RELEASE'>
+ <a href='http://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+4.5-RELEASE'>
<tt>ipfw</tt></a>. Refer to the section on <tt>dummynet</tt>; ipfw
is the user interface for the <tt>Dummynet</tt> traffic shaper.
As noted in previous section above, you can alter the traffic
diff --git a/www/menu.php3 b/www/menu.php3
index 5dc16cfaf9..9eb1ca2e8d 100644
--- a/www/menu.php3
+++ b/www/menu.php3
@@ -436,9 +436,8 @@ function PAGEFOOTER() {
<br>
<!-- begin copyright -->
<font size=-2>
- © 2000-2002 The University of Utah.
<a href="<?php echo "$TBDOCBASE"; ?>/docwrapper.php3?docname=copyright.html">
- All rights reserved.</a>
+ Copyright © 2000-2002 The University of Utah</a>
</font>
<br />
</center>
diff --git a/www/software.html b/www/software.html
index 5fddcfb383..583488ee8d 100644
--- a/www/software.html
+++ b/www/software.html
@@ -11,37 +11,41 @@
<ul>
<li><b>Wide-area nodes</b>: FreeBSD 4.6 with additions for robustness
- and for participation in the wide area testbed.
+ and for participation in the wide area Netbed.
<p>
-<li><b>boss.emulab.net</b>: Master node, database, web server, name server, trusted disk-image server
+<li><b>boss.emulab.net</b>: Master server, database, web server, name server, trusted disk-image server
<p>
Also known as <b>www.netbed.org</b>.
- Runs FreeBSD 4.5-RELEASE. This is the master machine for the testbed
+ Runs FreeBSD. This is the master machine for the testbed
software. Runs all the critical software components and thus is not
- directly accessible by testbed users. Moderates (via the database)
+ directly accessible by testbed users. Mediates (via the database)
access to node power cycling and disk-image loading as well as providing
DNS and web services.
<p>
-<li><b>users.emulab.net</b>: Control node, NFS server, test node serial line server and console access point
+<li><b>users.emulab.net</b>: NFS and SFS file server, login/control/console access point,
+ serial line server.
+
<p>
- Also known as <b>ops.emulab.net</b>.
- Runs FreeBSD 4.5-RELEASE. This is the main server machine for users
- of the testbed and is where home directories and all project files
- live. While most of the testbed configuration process is done via
+ Also known as <b>ops.emulab.net</b> and <b>fs.emulab.net</b>.
+ Currently runs FreeBSD 4.5-RELEASE. This is the main server machine for users
+ of the testbed and is where shared home directories and all project files
+ live. While most of the testbed configuration process is done via
the Web interface, a few things must be done while logged into
users.emulab.net. These testbed specific commands and programs are
contained in <code>/usr/testbed/bin</code>. Your skeleton login
- files will already have this directory in your path.
+ files already have this directory in your path.
<p>
This is also one of Emulab's "serial-line console" servers. Experimenters can access
- the console of any testbed node (using <code>tip</code>) from here.
+ the console of any testbed node (using the <code>console</code> program) from here.
Console output of all nodes is also logged here.
+</ul>
<h3>Machines used only for ``Emulab Classic'':</h3>
+<ul>
<p>
<li><b>tipserv1.emulab.net</b>: additional test node serial line server
<p>
@@ -53,7 +57,7 @@
<p>
<li><b>pc[1-40].emulab.net</b>: <a href="hardware.html#tbpc600">pc600</a> testbed PC nodes
<p>
- The testbed nodes can dual boot FreeBSD 4.3 and RedHat Linux 7.1.
+ The testbed nodes can dual boot FreeBSD 4.5 and RedHat Linux 7.1.
You may also boot your own OSKit kernels on them. Alternatively, you
can run whatever OS you like by loading your own OS image onto the
the 4th DOS slice using the Testbed configuration software.
@@ -71,13 +75,13 @@
All of these nodes have their COM1 serial interface (console
port) connected to users.emulab.net. The port is configured to run
at 115K baud, and are accessible from users.emulab.net via
- <code>tip</code> using the appropriate "pc" names; e.g., "pc6."
+ <code>console</code> using the appropriate "pc" names; e.g., "pc6."
<p>
<li><b>pc[41-168].emulab.net</b>: <a href="hardware.html#tbpc850">pc850</a> testbed PC nodes
<p>
Same as "pc600" nodes from a software perspective:
- dual booting FreeBSD 4.3 and RedHat Linux 7.1, or capable of running
+ dual booting FreeBSD 4.5 and RedHat Linux 7.1, or capable of running
custom OSKit kernels.
However, due to differences in the hardware configuration,
the "control" interface is <code>fxp0</code> under FreeBSD,
@@ -108,7 +112,7 @@
limited number of serial ports on the control node, only the last
Shark on each shelf is connected to the control node. These
designated Shark console lines are accessible from
- users.emulab.net (via the tip command) using the appropriate
+ users.emulab.net (via the <code>console</code> command) using the appropriate
"tbsh" shelf names; e.g., "sh16."
</ul>
diff --git a/www/tutorial/advanced.html b/www/tutorial/advanced.html
index 4c6caae93c..6e769bff27 100644
--- a/www/tutorial/advanced.html
+++ b/www/tutorial/advanced.html
@@ -30,7 +30,7 @@ adhere to the syntax and operational model of
traffic generation, in conjunction with either Agent/UDP or
Agent/TCP agents. We currently use the
<a href="http://www.postel.org/tg">TG Tool Set</a> to generate
- traffic (usermode programs running on FreeBSD 4.3 endpoints).
+ traffic (usermode programs running on FreeBSD 4.5 endpoints).
<li> <b>Traffic Generation using
<a href="http://www.isi.edu/nsnam/ns/doc/node487.html">
diff --git a/www/tutorial/tutorial.html b/www/tutorial/tutorial.html
index 16434dc0a4..beff05f191 100644
--- a/www/tutorial/tutorial.html
+++ b/www/tutorial/tutorial.html
@@ -157,7 +157,7 @@ In addition to the standard NS syntax above, a number of
extensions</a> have been added that allow you
to better control your experiment. For example, you may specify what
Operating System is booted on your nodes. We currently support FreeBSD
-4.3 and Linux RedHat 7.1, as well as
+4.5 and Linux RedHat 7.1, as well as
<a href="http://www.cs.utah.edu/flux/oskit/">OSKit</a> kernels on the
testbed PCs. By default, Linux RedHat 7.1 is selected.
--
GitLab