Commit 8f138765 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Changes to reflect new database field def_boot_path, which overrides

def_boot_image_id, but is in turn overridden by next_boot_path.
parent 6dcb6468
......@@ -153,7 +153,8 @@ $uid_email = $row[1];
mail($TBMAIL_CONTROL,
"TESTBED: Project $pid removed",
"Project '$pid' has been removed by $uid ($uid_name).\n\n",
"Project '$pid' has been removed by $uid ($uid_name).\n\n".
"Please remember to remove the backup directory in /proj\n\n",
"From: $uid_name <$uid_email>\n".
"Errors-To: $TBMAIL_WWW");
......
......@@ -49,6 +49,7 @@ if (! $isadmin) {
$insert_result = mysql_db_query($TBDBNAME,
"UPDATE nodes SET ".
"def_boot_image_id=\"$def_boot_image_id\", ".
"def_boot_path=\"$def_boot_path\", ".
"def_boot_cmd_line=\"$def_boot_cmd_line\", ".
"next_boot_path=\"$next_boot_path\", ".
"next_boot_cmd_line=\"$next_boot_cmd_line\" ".
......
......@@ -58,6 +58,7 @@ echo "<center><h1>
$node_id = $row[node_id];
$type = $row[type];
$def_boot_image_id = $row[def_boot_image_id];
$def_boot_path = $row[def_boot_path];
$def_boot_cmd_line = $row[def_boot_cmd_line];
$next_boot_path = $row[next_boot_path];
$next_boot_cmd_line = $row[next_boot_cmd_line];
......@@ -96,6 +97,14 @@ echo "<tr>
value=\"$def_boot_image_id\"></td>
</tr>\n";
echo "<tr>
<td>Def Boot Path:</td>
<td class=\"left\">
<input type=\"text\" name=\"def_boot_path\" size=\"40\"
value=\"$def_boot_path\"></td>
</tr>\n";
echo "<tr>
<td>Def Boot Command Line:</td>
<td class=\"left\">
......
......@@ -43,6 +43,7 @@ echo "<tr>
<td>PID</td>
<td>EID</td>
<td>Def Image</td>
<td>Def Path</td>
<td>Def Cmdline</td>
<td>Next Path</td>
<td>Next Cmdline</td>
......@@ -52,12 +53,15 @@ while ($row = mysql_fetch_array($query_result)) {
$node_id = $row[node_id];
$type = $row[type];
$def_boot_image_id = $row[def_boot_image_id];
$def_boot_path = $row[def_boot_path];
$def_boot_cmd_line = $row[def_boot_cmd_line];
$next_boot_path = $row[next_boot_path];
$next_boot_cmd_line = $row[next_boot_cmd_line];
if (!$def_boot_cmd_line)
$def_boot_cmd_line = "NULL";
if (!$def_boot_path)
$def_boot_path = "NULL";
if (!$next_boot_path)
$next_boot_path = "NULL";
if (!$next_boot_cmd_line)
......@@ -91,6 +95,7 @@ while ($row = mysql_fetch_array($query_result)) {
<td>$pid</td>
<td>$eid</td>
<td>$def_boot_image_id</td>
<td>$def_boot_path</td>
<td>$def_boot_cmd_line</td>
<td>$next_boot_path</td>
<td>$next_boot_cmd_line</td>
......
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