Commit ff4f97d3 authored by Chad Barb's avatar Chad Barb

A couple of the changes Jay wanted:

 - move 'Node to Create Image From' above OS Features
 - make all Node Types default to checked

Also cleaned up footnotes a touch.
parent 9e55b0b1
...@@ -326,11 +326,24 @@ function SPITFORM($formfields, $errors) ...@@ -326,11 +326,24 @@ function SPITFORM($formfields, $errors)
</td> </td>
</tr>\n"; </tr>\n";
#
# Node to Create image from.
#
echo "<tr>
<td>Node to Create Image from[<b>2</b>]:</td>
<td class=left>
<input type=text
name=\"formfields[node]\"
value=\"" . $formfields[node] . "\"
size=$TBDB_NODEIDLEN maxlength=$TBDB_NODEIDLEN>
</td>
</tr>\n";
# #
# OS Features. # OS Features.
# #
echo "<tr> echo "<tr>
<td>OS Features[<b>2</b>]:</td> <td>OS Features[<b>3</b>]:</td>
<td>"; <td>";
reset($featurelist); reset($featurelist);
...@@ -352,7 +365,7 @@ function SPITFORM($formfields, $errors) ...@@ -352,7 +365,7 @@ function SPITFORM($formfields, $errors)
# Operational Mode # Operational Mode
# #
echo "<tr> echo "<tr>
<td>*Operational Mode[<b>3</b>]:</td> <td>*Operational Mode[<b>4</b>]:</td>
<td><select name=\"formfields[op_mode]\"> <td><select name=\"formfields[op_mode]\">
<option value=none>Please Select </option>\n"; <option value=none>Please Select </option>\n";
...@@ -373,7 +386,7 @@ function SPITFORM($formfields, $errors) ...@@ -373,7 +386,7 @@ function SPITFORM($formfields, $errors)
# Node Types. # Node Types.
# #
echo "<tr> echo "<tr>
<td>Node Types[<b>4</b>]:</td> <td>Node Types[<b>5</b>]:</td>
<td>\n"; <td>\n";
mysql_data_seek($types_result, 0); mysql_data_seek($types_result, 0);
...@@ -381,7 +394,8 @@ function SPITFORM($formfields, $errors) ...@@ -381,7 +394,8 @@ function SPITFORM($formfields, $errors)
$type = $row[type]; $type = $row[type];
$checked = ""; $checked = "";
if (strcmp($formfields["mtype_$type"], "Yep") == 0) if (strcmp($formfields["mtype_$type"], "Yep") == 0
|| strcmp($formfields["mtype_all"], "Yep") == 0)
$checked = "checked"; $checked = "checked";
echo "<input $checked type=checkbox echo "<input $checked type=checkbox
...@@ -392,19 +406,6 @@ function SPITFORM($formfields, $errors) ...@@ -392,19 +406,6 @@ function SPITFORM($formfields, $errors)
echo " </td> echo " </td>
</tr>\n"; </tr>\n";
#
# Node to Create image from.
#
echo "<tr>
<td>Node to Create Image from[<b>5</b>]:</td>
<td class=left>
<input type=text
name=\"formfields[node]\"
value=\"" . $formfields[node] . "\"
size=$TBDB_NODEIDLEN maxlength=$TBDB_NODEIDLEN>
</td>
</tr>\n";
# #
# Whole Disk Image # Whole Disk Image
# #
...@@ -496,33 +497,46 @@ function SPITFORM($formfields, $errors) ...@@ -496,33 +497,46 @@ function SPITFORM($formfields, $errors)
<ul> <ul>
<li> if you customized one of our standard Linux <li> if you customized one of our standard Linux
images (RHL-*) then it is partition 2. images (RHL-*) then it is partition 2.
</li>
<li> if you customized one of our standard BSD <li> if you customized one of our standard BSD
images (FBSD-*) then it is partition 1. images (FBSD-*) then it is partition 1.
</li>
<li> otherwise, feel free to ask us! <li> otherwise, feel free to ask us!
</li>
</ul> </ul>
</li>
<li> If you already have a node customized, enter that node
name (pcXXX) and the image will be auto created for you.
Notification of completion will be sent to you via email.
</li>
<li> Guidelines for setting OS features for your OS: <li> Guidelines for setting OS features for your OS:
(Most images should mark all four of these.) (Most images should mark all four of these.)
<ol type=a> <ul>
<li> Mark ping and/or ssh if they are supported. <li> Mark ping and/or ssh if they are supported.
</li>
<li> If you use one of our standard Linux or FreeBSD <li> If you use one of our standard Linux or FreeBSD
kernels, or started from our kernel configs, mark ipod. kernels, or started from our kernel configs, mark ipod.
</li>
<li> If it is based on one of our standard Linux or <li> If it is based on one of our standard Linux or
FreeBSD images (or otherwise FreeBSD images (or otherwise
sends its own ISUP notification), mark isup. sends its own ISUP notification), mark isup.
</ol> </li>
</ul>
</li>
<li> Guidelines for setting Operational Mode for your OS: <li> Guidelines for setting Operational Mode for your OS:
(Most images should use NORMALv1.) (Most images should use NORMALv1.)
<ol type=a> <ul>
<li> If it is based on a testbed image (one of our <li> If it is based on a testbed image (one of our
RedHat Linux or FreeBSD images) use the same RedHat Linux or FreeBSD images) use the same
op_mode as that image (should be NORMALv1, op_mode as that image (should be NORMALv1,
or NORMAL for old images. Select it from the or NORMAL for old images. Select it from the
<a href=\"$TBBASE/showosid_list.php3\" <a href=\"$TBBASE/showosid_list.php3\"
>OS Descriptor List</a> to find out). >OS Descriptor List</a> to find out).
<li> If not, use MINIMAL. </li>
</ol> <li> If not, use MINIMAL.
</li>
</ul>
</li>
<li> Specify the node types that this image will be able <li> Specify the node types that this image will be able
to work on (can be loaded on and expected to work). to work on (can be loaded on and expected to work).
Typically, images will work on all of the \"pc\" types when Typically, images will work on all of the \"pc\" types when
...@@ -530,15 +544,15 @@ function SPITFORM($formfields, $errors) ...@@ -530,15 +544,15 @@ function SPITFORM($formfields, $errors)
if you are installing your own OS from scratch, or you are if you are installing your own OS from scratch, or you are
using DOS partition four, then this might not be true. using DOS partition four, then this might not be true.
Feel free to ask us! Feel free to ask us!
<li> If you already have a node customized, enter that node </li>
name (pcXXX) and the image will be auto created for you.
Notification of completion will be sent to you via email.
<li> If you need to snapshot the entire disk (including the MBR), <li> If you need to snapshot the entire disk (including the MBR),
check this option. <b>Most users will not need to check this check this option. <b>Most users will not need to check this
option. Please ask us first to make sure</b>. option. Please ask us first to make sure</b>.
</li>
<li> If your image contains software that is only licensed to run <li> If your image contains software that is only licensed to run
on a limited number of nodes at a time, you can put this on a limited number of nodes at a time, you can put this
number here. Most users will want to leave this option blank. number here. Most users will want to leave this option blank.
</li>
</ol> </ol>
</blockquote></h4>\n"; </blockquote></h4>\n";
} }
...@@ -556,6 +570,10 @@ if (! $submit) { ...@@ -556,6 +570,10 @@ if (! $submit) {
$defaults[os_feature_ipod] = "checked"; $defaults[os_feature_ipod] = "checked";
$defaults[os_feature_isup] = "checked"; $defaults[os_feature_isup] = "checked";
# mtype_all is a "fake" variable which makes all
# mtypes checked in the virgin form.
$defaults[mtype_all] = "Yep";
# #
# For users that are in one project and one subgroup, it is usually # For users that are in one project and one subgroup, it is usually
# the case that they should use the subgroup, and since they also tend # the case that they should use the subgroup, and since they also tend
......
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