X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnodes.php;h=ebe80797571a5ff6585fc0ccddf0de52a9dfde86;hb=2b7b30c9a62caef1af45e1ff11a88a72fac4adef;hp=fd96f519b1b3b6d38665eeaf2101e2afd4629426;hpb=784cfe2a92ff21e58b773b6895e6ea4b82a0c646;p=plewww.git

diff --git a/planetlab/nodes/nodes.php b/planetlab/nodes/nodes.php
index fd96f51..ebe8079 100644
--- a/planetlab/nodes/nodes.php
+++ b/planetlab/nodes/nodes.php
@@ -20,7 +20,7 @@ require_once 'linetabs.php';
 require_once 'table.php';
 require_once 'nifty.php';
 
-ini_set("memory_limit","48M");
+ini_set("memory_limit","64M");
 
 // -------------------- 
 // recognized URL arguments
@@ -61,7 +61,7 @@ function node_status ($node) {
 }
 
 // fetch nodes 
-$node_columns=array('hostname','node_type','site_id','node_id','boot_state','interface_ids','peer_id', 'arch','slice_ids');
+$node_columns=array('hostname','node_type','site_id','node_id','boot_state','run_level','interface_ids','peer_id', 'arch','slice_ids');
 // server-side filtering - set pattern in $_GET for filtering on hostname
 if ($pattern) {
   $node_filter['hostname']=$pattern;
@@ -184,7 +184,11 @@ foreach ($nodes as $node) {
   $peers->cell ($table,$peer_id);
   $table->cell (topdomain($hostname));
   $table->cell (l_site_t($site_id,$login_base));
-  $table->cell ($node['boot_state']);
+  if ($node['run_level']) {
+      $table->cell($node['run_level']);
+  } else {
+      $table->cell ($node['boot_state'] . '*');
+  }
   $table->cell (l_node_t($node_id,$hostname));
   $table->cell ($node_type);
   $table->cell (l_interface_t($interface_id,$ip),array('only-if'=> !$peer_id));
@@ -201,6 +205,7 @@ $notes []= "R = region";
 $notes []= "A = arch";
 $notes []= "S = number of slivers";
 $notes []= "? = status";
+$notes []= "status* = node doesn't have an observed state, preferred state is displayed";
 $table->end(array('notes'=>$notes));
 $nifty->end();