add node-usb-partition as an option for download.

diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php
index 773a631..68ef0fc 100644 (file)
--- a/planetlab/nodes/node.php
+++ b/planetlab/nodes/node.php
@@ -197,6 +197,7 @@ if ( $local_peer  && $privileges) {
                     array("display"=>"-- All in one images --","disabled"=>true),
                     array("value"=>"download-node-iso","display"=>"Download ISO image for $hostname"),
                     array("value"=>"download-node-usb","display"=>"Download USB image for $hostname"),
+                    array("value"=>"download-node-usb-partition", "display"=>"Download partitioned, USB image for $hostname"),
                     array("display"=>"-- Floppy + generic image --","disabled"=>true),
                     array("value"=>"download-node-floppy","display"=>"Download Floppy file for $hostname"),
                     array("value"=>"download-generic-iso","display"=>"Download generic ISO image (requires floppy)"),

diff --git a/planetlab/nodes/node_downloads.php b/planetlab/nodes/node_downloads.php
index c457934..c6148b2 100644 (file)
--- a/planetlab/nodes/node_downloads.php
+++ b/planetlab/nodes/node_downloads.php
@@ -143,6 +143,8 @@ switch ($action) {
  case "download-node-floppy":
  case "download-node-iso":
  case "download-node-usb":
+ case "download-node-usb-partition":
+
    
    $nodes = $api->GetNodes( array( $node_id ) );
    $node = $nodes[0];
@@ -196,18 +198,26 @@ switch ($action) {
      case 'download-node-floppy':
        $boot_action='node-floppy'; 
        $location = "%d/%n-%v-rename-into-plnode%s";
+       $options = array();
        break;
      case 'download-node-iso':
        $boot_action='node-iso';
        $location = "%d/%n-%a-%v%s";
+       $options = array();
        break;
      case 'download-node-usb':
        $boot_action='node-usb';
        $location = "%d/%n-%a-%v%s";
+       $options = array();
+       break;
+     case "download-node-usb-partition":
+       $boot_action='node-usb';
+       $location = "%d/%n-%a-%v-partition%s";
+       $options = array('partition');
        break;
      }  
 
-     $filename=$api->GetBootMedium($node_id,$boot_action,$location);
+     $filename=$api->GetBootMedium($node_id,$boot_action,$location,$options);
      $error=$api->error();
      if (empty($error) && empty($filename)) {
        $error="Unexpected error from GetBootMedium - probably wrong directory modes";