From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Fri, 13 Mar 2009 19:08:58 +0000 (+0000)
Subject: print a clear error when RebootNodeWithPCU returns a non-zero status.
X-Git-Tag: www-register-wizard-4.2-1~3
X-Git-Url: http://git.onelab.eu/?p=www-register-wizard.git;a=commitdiff_plain;h=36cffec73e06a4ba8e9d0b4eb6e3026dc6ac637e

print a clear error when RebootNodeWithPCU returns a non-zero status.
---

diff --git a/application/controllers/confirm.php b/application/controllers/confirm.php
index 2f399f5..83fe71c 100644
--- a/application/controllers/confirm.php
+++ b/application/controllers/confirm.php
@@ -166,10 +166,11 @@ class Confirm extends Controller {
 		$hostname = $data['node_id'];
 		$api->UpdateNode( $hostname, array( "boot_state" => 'rins') );
 		$ret = $api->RebootNodeWithPCU( $hostname );
-		if ( $ret != 0 ) {
+		if ( "$ret" != "0" ) {
+			$data['error'] = $ret;
+		} else {
 			$data['error'] = $api->error();
 		}
-		$data['error'] = $api->error();
 	}
 }
 ?>
diff --git a/application/views/stage8_rebootpcu.php b/application/views/stage8_rebootpcu.php
index 7998e54..1ef354e 100644
--- a/application/views/stage8_rebootpcu.php
+++ b/application/views/stage8_rebootpcu.php
@@ -31,6 +31,10 @@
 			The installation is complete; your machine has reached the final
 			'boot' state.  You can continue to the final stage.</dd>
 	<?php endif; ?>
+<?php if ( isset($error) && ! empty($error) ): ?>
+		<dt> <span class='error'> Reboot Failure: </span> </dt>
+		<dd> <span class='error'> <?= $error ?> </span> </dd>
+<?php endif; ?>
 </dl>
 
 <table><tbody>
@@ -52,13 +56,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>