X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=application%2Fviews%2Fstage8_rebootpcu.php;h=dd0cf711dd40bb3d1f687d1d6524684ef4bfc8e6;hb=882f60e952c36b4ee5ef452df5cb4bae074a1198;hp=7998e54dc2567808c5dd7c356dcde2f590b6665c;hpb=90cda1cb0615add2133bc397973e755e958e2619;p=www-register-wizard.git

diff --git a/application/views/stage8_rebootpcu.php b/application/views/stage8_rebootpcu.php
index 7998e54..dd0cf71 100644
--- a/application/views/stage8_rebootpcu.php
+++ b/application/views/stage8_rebootpcu.php
@@ -2,22 +2,16 @@
 <div class="plroundedwhite">
 <h3>Confirm Reboot Node With PCU</h3>
 <dl>
-	<?php if ( $node['boot_state'] == "disable" ): ?>
+	<?php if ( $node['boot_state'] == "disabled" ): ?>
 	<dt>Step 1</dt>
 		<dd>
 			<span class='error'>
-			Use the 'Test Reboot' button.  This will set the boot state to 'rins' and 
+			Use the 'Test Reboot' button.  This will set the boot state to 'reinstall' and 
 			attempt to reboot your machine using the registered PCU.
 			</span>
 		</dd>
-	<?php elseif ( $node['boot_state'] == "rins" || $node['boot_state'] == "reinstall" ): ?>
-	<dt>If Reboot succeeds,</dt><dd>
-			your machine will reboot, install the bootstrap image, and 
-			contacted PLC.  Finally, the boot state will be updated to 'boot'.
-			<br>
-			Continue using the 'Reload' button to check whether the node has
-			completed its installation.
-	</dd>
+	<?php elseif ( $node['boot_state'] == "reinstall" ): ?>
+<?php if ( isset($error) && ! empty($error) ): ?>
 	<dt>If Reboot fails,</dt><dd>
 			there will be an error displayed that will assist you in
 			diagnosing the error.  Otherwise, please double check the
@@ -25,7 +19,25 @@
 			PCU manually (using it's web or ssh interface).
 			<br>
 			To try the test again, use 'Test Reboot'.<br>
+			If you need help diagnosing the problem, please contact 
+			<a href="mailto:support@planet-lab.org?subject=Reboot Failed: <?= $error ?>">PlanetLab Support</a>.
 	</dd>
+		<dt> <span class='error'> Reboot Failure: </span> </dt>
+		<dd> <span class='error'> <?= $error ?> </span> </dd>
+	<?php else: ?>
+	<dt>If Reboot succeeds,</dt><dd>
+			your machine will reboot, install the bootstrap image, and 
+			contacted PLC.  Finally, the boot state will be updated to 'boot'.
+			<br>
+			Continue using the 'Reload' button to check whether the node has
+			completed its installation.
+	</dd>
+		<dt> Reboot without error: </dt>
+		<dd> No errors were reported for your reboot.  Please double check by
+		confirming at the console.  If the reboot failed, please report this
+		to <a href="mailto:support@planet-lab.org?subject=No error for failed PCU reboot">PlanetLab Feedback</a>.
+		</dd>
+<?php endif; ?>
 	<?php else: ?>
 	<dt><b>Success!!</b></dt><dd>
 			The installation is complete; your machine has reached the final
@@ -40,7 +52,7 @@
 		<td>
 		<?php if ( $node['boot_state'] == "disable" ): ?>
 			<span class='error'> Start with the 'Test Reboot' button.</span>
-		<?php elseif ( $node['boot_state'] == "rins" ): ?>
+		<?php elseif ( $node['boot_state'] == "reinstall" ): ?>
 			<br>'Test Reboot' to start again.<br>
 			'Reload' to Reload this page.
 		<?php else: ?>
@@ -52,13 +64,6 @@
 	<tr><th>Model: </th><td><?= $node['model'] ?></td></tr>
 	<tr><th>Version: </th><td nowrap='1'><?= $node['version'] ?></td></tr>
 	<tr><th>Last Contact: </th><td><?= $last_contact_str ?></td></tr>
-<?php if ( isset($error) && ! empty($error) ): ?>
-	<tr>
-		<td colspan=2>
-			<span class='error'> <?= $error ?> </span>
-		</td>
-	</tr>
-<?php endif; ?>
 	<tr>
 		<td>
 		</td>
@@ -77,7 +82,7 @@
 		<?php else: ?>
 				<input type='submit' disabled value='Continue'>
 		<?php endif; ?>
-				<input type='submit' value='Debug Continue'>
+				<!--input type='submit' value='Debug Continue'-->
 		</form>
 </tbody></table><br />
 </div>