All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 4968c560 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Forgot to commit this ... change hardware page to include site

specific hardware page or else generate error. This prevents all
Emulabs from having our hardware listing.
parent e3251dd4
<?php <?php
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group. # Copyright (c) 2000-2008 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
require("defs.php3"); require("defs.php3");
...@@ -77,7 +77,7 @@ echo "<li><b><a href=\"$TBBASE/kb-search.php3\">\n ...@@ -77,7 +77,7 @@ echo "<li><b><a href=\"$TBBASE/kb-search.php3\">\n
Emulab Internals</a></b> Emulab Internals</a></b>
<li><b><a href = "doc/docwrapper.php3?docname=hw-recommend.html"> <li><b><a href = "doc/docwrapper.php3?docname=hw-recommend.html">
Want to build your own Testbed?</a></b> Want to build your own Testbed?</a></b>
<li><b><a href = "docwrapper.php3?docname=hardware.html"> <li><b><a href = "hardware.php">
Current Hardware Overview</a></b> Current Hardware Overview</a></b>
<li><b><a href = "docwrapper.php3?docname=software.html"> <li><b><a href = "docwrapper.php3?docname=software.html">
Current Software Overview</a></b> Current Software Overview</a></b>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<body> <body>
<!-- <!--
EMULAB-COPYRIGHT EMULAB-COPYRIGHT
Copyright (c) 2000-2005 University of Utah and the Flux Group. Copyright (c) 2000-2005, 2008 University of Utah and the Flux Group.
All rights reserved. All rights reserved.
--> -->
<h2>Windows XP in Emulab</h2> <h2>Windows XP in Emulab</h2>
...@@ -1370,7 +1370,7 @@ href="http://www.microsoft.com/downloads/details.aspx?FamilyId=9B3A2CA6-3647-407 ...@@ -1370,7 +1370,7 @@ href="http://www.microsoft.com/downloads/details.aspx?FamilyId=9B3A2CA6-3647-407
<li> <li>
These images work on the <a These images work on the <a
href="../docwrapper.php3?docname=hardware.html#tbpc3000w"><u>pc3000w href="../hardware.php#tbpc3000w"><u>pc3000w
(WiFi)</u></a> nodes. There are drivers for the NetGear WAG311 (WiFi)</u></a> nodes. There are drivers for the NetGear WAG311
WiFi cards installed, but no <a WiFi cards installed, but no <a
href="../tutorial/docwrapper.php3?docname=wireless.html">Emulab href="../tutorial/docwrapper.php3?docname=wireless.html">Emulab
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2008 University of Utah and the Flux Group.
# All rights reserved.
#
require("defs.php3");
#
# Verify page arguments.
#
$optargs = OptionalPageArguments("printable", PAGEARG_BOOLEAN);
#
# Allow for a site specific hardware page. Hopefully this is where the
# bulk of the site specific stuff can go, otherwise we need to get more
# clever about this.
#
$sitefile = "hardware-" . strtolower($THISHOMEBASE) . ".html";
if (!file_exists($sitefile)) {
PAGEHEADER("Hardware Overview");
USERERROR("This Emulab has not established a site-specific hardware page.",
1);
}
if (!isset($printable))
$printable = 0;
#
# Standard Testbed Header
#
if (!$printable) {
PAGEHEADER("Hardware Overview");
}
if (!$printable) {
echo "<b><a href=$REQUEST_URI?printable=1>
Printable version of this document</a></b><br>\n";
}
readfile("$sitefile");
#
# Standard Testbed Footer
#
if (!$printable) {
PAGEFOOTER();
}
?>
<?php <?php
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group. # Copyright (c) 2000-2008 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
require("defs.php3"); require("defs.php3");
...@@ -174,7 +174,7 @@ network experimentation. ...@@ -174,7 +174,7 @@ network experimentation.
Authorization Scheme, Policy, and "How To Get Started"</a></b> Authorization Scheme, Policy, and "How To Get Started"</a></b>
<li><b><a href = "docwrapper.php3?docname=software.html"> <li><b><a href = "docwrapper.php3?docname=software.html">
Overview of Installed Software</a></b> Overview of Installed Software</a></b>
<li><b><a href = "docwrapper.php3?docname=hardware.html"> <li><b><a href = "hardware.php">
Hardware Overview, "Emulab Classic"</a></b> Hardware Overview, "Emulab Classic"</a></b>
<li><b><a href = "docwrapper.php3?docname=security.html"> <li><b><a href = "docwrapper.php3?docname=security.html">
Security Issues</a></b> Security Issues</a></b>
......
<?php <?php
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group. # Copyright (c) 2000-2008 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
include("defs.php3"); include("defs.php3");
...@@ -483,7 +483,7 @@ function SPITFORM($formfields, $returning, $errors) ...@@ -483,7 +483,7 @@ function SPITFORM($formfields, $returning, $errors)
echo "<tr> echo "<tr>
<td colspan=2>*Estimated #of <td colspan=2>*Estimated #of
<a href=\"$TBDOCBASE/docwrapper.php3?docname=hardware.html#tbpcs\" target='_blank'> <a href=\"$TBDOCBASE/hardware.php#tbpcs\" target='_blank'>
PCs</a>:</td> PCs</a>:</td>
<td class=left> <td class=left>
<input type=text <input type=text
......
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