From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 23 Apr 2008 15:53:37 +0000 (+0000)
Subject: using %a from GetBootMedium
X-Git-Tag: PLEWWW-PLE.5.0-0~18
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c6bcf617606f31d40a6c07d3c471c7b2e039f662;p=plewww.git

using %a from GetBootMedium
---

diff --git a/planetlab/nodes/node_actions.php b/planetlab/nodes/node_actions.php
index 945e259..1a52e0b 100644
--- a/planetlab/nodes/node_actions.php
+++ b/planetlab/nodes/node_actions.php
@@ -233,7 +233,7 @@ switch ($action) {
    }
 
    // place the result in a random-named sub dir for clear filenames
-   $filename = $api->GetBootMedium ($node_id, $boot_action, "%d/%n-%p-%v%s");
+   $filename = $api->GetBootMedium ($node_id, $boot_action, "%d/%n-%p-%a-%v%s");
    $error=$api->error();
    // NOTE. for some reason, GetBootMedium sometimes does not report an error but the
    // file is not created - this happens e.g. when directory owmer/modes are wrong 
@@ -340,11 +340,11 @@ switch ($action) {
 	 break;
        case 'download-node-iso':
 	 $boot_action='node-iso';
-	 $location = "%d/%n-%v%s";
+	 $location = "%d/%n-%a-%v%s";
 	 break;
        case 'download-node-usb':
 	 $boot_action='node-usb';
-	 $location = "%d/%n-%v%s";
+	 $location = "%d/%n-%a-%v%s";
 	 break;
        }