From acf54750a8959a73664e55ef95289f1b811e5d45 Mon Sep 17 00:00:00 2001
From: Carlos Aguado Sanchez <carlos.aguado@epfl.ch>
Date: Fri, 17 Jan 2014 18:32:59 +0100
Subject: [PATCH] Fix naming scheme for cache and iso
Signed-off-by: Carlos Aguado Sanchez <carlos.aguado@epfl.ch>
---
samples/vboxwrapper/vboxwrapper.cpp | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp
index fdb87a9363..9436a71b87 100644
--- a/samples/vboxwrapper/vboxwrapper.cpp
+++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -776,14 +776,6 @@ int main(int argc, char** argv) {
);
vm.floppy_image_filename = buf;
}
- if (vm.enable_cache_disk) {
- sprintf(buf, "%s.%s", CACHE_DISK_FILENAME, CACHE_DISK_FILENAME_EXTENSION);
- vm.cache_disk_filename = buf;
- }
- if (vm.enable_isocontextualization) {
- sprintf(buf, "%s.%s", ISO_IMAGE_FILENAME, ISO_IMAGE_FILENAME_EXTENSION);
- vm.iso_image_filename = buf;
- }
} else {
vm.vm_master_name += md5_string(std::string(aid.result_name)).substr(0, 16);
vm.vm_master_description = aid.result_name;
@@ -800,14 +792,14 @@ int main(int argc, char** argv) {
);
vm.floppy_image_filename = buf;
}
- if (vm.enable_cache_disk) {
- sprintf(buf, "%s_%d.%s", CACHE_DISK_FILENAME, aid.slot, CACHE_DISK_FILENAME_EXTENSION);
- vm.cache_disk_filename = buf;
- }
- if (vm.enable_isocontextualization) {
- sprintf(buf, "%s_%d.%s", ISO_IMAGE_FILENAME, aid.slot, ISO_IMAGE_FILENAME_EXTENSION);
- vm.iso_image_filename = buf;
- }
+ }
+ if (vm.enable_cache_disk) {
+ sprintf(buf, "%s.%s", CACHE_DISK_FILENAME, CACHE_DISK_FILENAME_EXTENSION);
+ vm.cache_disk_filename = buf;
+ }
+ if (vm.enable_isocontextualization) {
+ sprintf(buf, "%s.%s", ISO_IMAGE_FILENAME, ISO_IMAGE_FILENAME_EXTENSION);
+ vm.iso_image_filename = buf;
}
if (aid.ncpus > 1.0 || ncpus > 1.0) {
if (ncpus) {
--
GitLab