- VBOX: Remove the renaming of the vm disk image code. It isn't needed

and it complicates things in the CC.
        
    samples/vboxwrapper/
        vboxwrapper.cpp

svn path=/trunk/boinc/; revision=25220
This commit is contained in:
Rom Walton 2012-02-08 20:31:03 +00:00
parent bfe3b7cbb8
commit 8397db8a9e
2 changed files with 8 additions and 4 deletions

View File

@ -1508,3 +1508,10 @@ David 7 Feb 2012
pers_file_xfer.cpp pers_file_xfer.cpp
cs_apps.cpp cs_apps.cpp
cs_files.cpp cs_files.cpp
Rom 8 Feb 2012
- VBOX: Remove the renaming of the vm disk image code. It isn't needed
and it complicates things in the CC.
samples/vboxwrapper/
vboxwrapper.cpp

View File

@ -370,18 +370,15 @@ int main(int argc, char** argv) {
boinc_get_init_data_p(&aid); boinc_get_init_data_p(&aid);
vm.vm_master_name = "boinc_"; vm.vm_master_name = "boinc_";
vm.image_filename = IMAGE_FILENAME_COMPLETE;
if (boinc_is_standalone()) { if (boinc_is_standalone()) {
vm.vm_master_name += "standalone"; vm.vm_master_name += "standalone";
vm.image_filename = IMAGE_FILENAME_COMPLETE;
if (vm.enable_floppyio) { if (vm.enable_floppyio) {
sprintf(buf, "%s.%s", FLOPPY_IMAGE_FILENAME, FLOPPY_IMAGE_FILENAME_EXTENSION); sprintf(buf, "%s.%s", FLOPPY_IMAGE_FILENAME, FLOPPY_IMAGE_FILENAME_EXTENSION);
vm.floppy_image_filename = buf; vm.floppy_image_filename = buf;
} }
} else { } else {
vm.vm_master_name += aid.result_name; vm.vm_master_name += aid.result_name;
sprintf(buf, "%s_%d.%s", IMAGE_FILENAME, aid.slot, IMAGE_FILENAME_EXTENSION);
vm.image_filename = buf;
boinc_rename(IMAGE_FILENAME_COMPLETE, buf);
if (vm.enable_floppyio) { if (vm.enable_floppyio) {
sprintf(buf, "%s_%d.%s", FLOPPY_IMAGE_FILENAME, aid.slot, FLOPPY_IMAGE_FILENAME_EXTENSION); sprintf(buf, "%s_%d.%s", FLOPPY_IMAGE_FILENAME, aid.slot, FLOPPY_IMAGE_FILENAME_EXTENSION);
vm.floppy_image_filename = buf; vm.floppy_image_filename = buf;