Commit cb1d6bff authored by Russ Fish's avatar Russ Fish
Browse files

Minor fixes.

parent 60697ad7
...@@ -123,7 +123,7 @@ class Image ...@@ -123,7 +123,7 @@ class Image
# #
# Generate a temporary file and write in the XML goo. # Generate a temporary file and write in the XML goo.
# #
$xmlname = tempnam("/tmp", "newimageid"); $xmlname = tempnam("/tmp", $ez ? "newimageid_ez" : "newimageid");
if (! $xmlname) { if (! $xmlname) {
TBERROR("Could not create temporary filename", 0); TBERROR("Could not create temporary filename", 0);
$errors[] = "Transient error(1); please try again later."; $errors[] = "Transient error(1); please try again later.";
......
...@@ -562,7 +562,7 @@ if (isset($formfields["description"]) && $formfields["description"] != "") { ...@@ -562,7 +562,7 @@ if (isset($formfields["description"]) && $formfields["description"] != "") {
} }
if (isset($formfields["loadpart"]) && if (isset($formfields["loadpart"]) &&
$formfields["loadpart"] != "none" && $formfields["loadpart"] != "") { $formfields["loadpart"] != "X" && $formfields["loadpart"] != "") {
$args["loadpart"] = $formfields["loadpart"]; $args["loadpart"] = $formfields["loadpart"];
} }
......
...@@ -327,7 +327,7 @@ function SPITFORM($formfields, $errors) ...@@ -327,7 +327,7 @@ function SPITFORM($formfields, $errors)
if (strcmp($formfields["loadpart"], "$i") == 0) if (strcmp($formfields["loadpart"], "$i") == 0)
$selected = "selected"; $selected = "selected";
echo " <option $selected value=$i>$i </option>\n"; echo " <option $selected value=$i>$i </option>\n";
} }
echo " </select>"; echo " </select>";
...@@ -746,12 +746,10 @@ if (!isset($submit)) { ...@@ -746,12 +746,10 @@ if (!isset($submit)) {
$defaults["gid"] = ""; $defaults["gid"] = "";
$defaults["imagename"] = ""; $defaults["imagename"] = "";
$defaults["description"] = ""; $defaults["description"] = "";
$defaults["loadpart"] = "X";
$defaults["OS"] = ""; $defaults["OS"] = "";
$defaults["version"] = ""; $defaults["version"] = "";
$defaults["path"] = "$TBPROJ_DIR/"; $defaults["path"] = "$TBPROJ_DIR/";
$defaults["node_id"] = ""; $defaults["node_id"] = "";
$defaults["op_mode"] = "";
$defaults["wholedisk"] = "No"; $defaults["wholedisk"] = "No";
$defaults["max_concurrent"] = ""; $defaults["max_concurrent"] = "";
$defaults["shared"] = "No"; $defaults["shared"] = "No";
...@@ -765,9 +763,8 @@ if (!isset($submit)) { ...@@ -765,9 +763,8 @@ if (!isset($submit)) {
$defaults["OS"] = "TinyOS"; $defaults["OS"] = "TinyOS";
$defaults["version"] = "1.1.0"; $defaults["version"] = "1.1.0";
} else { } else {
# Defaulys for PC-type nodes # Defaults for PC-type nodes
$defaults["loadpart"] = "X"; $defaults["loadpart"] = "X";
$defaults["path"] = "$TBPROJ_DIR/";
$defaults["op_mode"] = TBDB_DEFAULT_OSID_OPMODE; $defaults["op_mode"] = TBDB_DEFAULT_OSID_OPMODE;
$defaults["os_feature_ping"] = "checked"; $defaults["os_feature_ping"] = "checked";
$defaults["os_feature_ssh"] = "checked"; $defaults["os_feature_ssh"] = "checked";
...@@ -916,7 +913,7 @@ if (isset($formfields["description"]) && $formfields["description"] != "") { ...@@ -916,7 +913,7 @@ if (isset($formfields["description"]) && $formfields["description"] != "") {
} }
if (isset($formfields["loadpart"]) && if (isset($formfields["loadpart"]) &&
$formfields["loadpart"] != "none" && $formfields["loadpart"] != "") { $formfields["loadpart"] != "X" && $formfields["loadpart"] != "") {
$args["loadpart"] = $formfields["loadpart"]; $args["loadpart"] = $formfields["loadpart"];
} }
......
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