Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #5658 from BOINC/dpa_vboxw_dir 

vboxwrapper: don't create projects/virtualbox
This commit is contained in:
David Anderson 2024-07-18 22:56:16 -07:00 committed by GitHub
parent f2be5afc70 0883a68a81
commit 1e13fc8f34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
samples/vboxwrapper/vbox_vboxmanage.cpp
View File

@ -38,6 +38,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <pwd.h>
#endif #endif
using std::string; using std::string;
@ -71,7 +72,6 @@ int VBOX_VM::initialize() {
string new_path; string new_path;
string command; string command;
string output; string output;
bool force_sandbox = false;
get_install_directory(virtualbox_install_directory); get_install_directory(virtualbox_install_directory);
@ -100,64 +100,34 @@ int VBOX_VM::initialize() {
} }
#endif #endif
// Determine the VirtualBox home directory. Overwrite as needed. // Determine the VirtualBox home directory.
// NOTE: I'm not sure this is relevant; see
// https://docs.oracle.com/en/virtualization/virtualbox/6.1/admin/TechnicalBackground.html#3.1.3.-Summary-of-Configuration-Data-Locations
// //
if (getenv("VBOX_USER_HOME")) { if (getenv("VBOX_USER_HOME")) {
virtualbox_home_directory = getenv("VBOX_USER_HOME"); virtualbox_home_directory = getenv("VBOX_USER_HOME");
} else { } else {
// If the override environment variable isn't specified then // If the override environment variable isn't specified then
// it is based of the current users HOME directory. // it is based of the current users HOME directory.
const char *home;
#ifdef _WIN32 #ifdef _WIN32
virtualbox_home_directory = getenv("USERPROFILE"); home = getenv("USERPROFILE");
if (home == NULL) {
vboxlog_msg("no USERPROFILE - exiting");
exit(1);
}
#else #else
virtualbox_home_directory = getenv("HOME"); home = getenv("HOME");
if (home == NULL) {
home = getpwuid(getuid())->pw_dir;
}
#endif #endif
virtualbox_home_directory = home;
virtualbox_home_directory += "/.VirtualBox"; virtualbox_home_directory += "/.VirtualBox";
} }
// On *nix style systems, VirtualBox expects
// that there is a home directory specified by environment variable.
// When it doesn't exist it attempts to store logging information
// in root's home directory.
// Bad things happen if the process attempts to use root's home directory.
//
// if the HOME environment variable is missing
// force VirtualBox to use a directory it
// has a reasonable chance of writing log files too.
#ifndef _WIN32
if (NULL == getenv("HOME")) {
force_sandbox = true;
}
#endif
// Set the location in which the VirtualBox Configuration files can be
// stored for this instance.
//
if (aid.using_sandbox || force_sandbox) {
virtualbox_home_directory = aid.project_dir;
virtualbox_home_directory += "/../virtualbox";
if (!boinc_file_exists(virtualbox_home_directory.c_str())) {
boinc_mkdir(virtualbox_home_directory.c_str());
}
#ifdef _WIN32 #ifdef _WIN32
if (!SetEnvironmentVariable("VBOX_USER_HOME", const_cast<char*>(virtualbox_home_directory.c_str()))) { // Not sure this is needed now that we're not using COM
vboxlog_msg("Failed to modify the search path.");
}
#else
// putenv does not copy its input buffer, so we must use setenv
if (setenv("VBOX_USER_HOME", const_cast<char*>(virtualbox_home_directory.c_str()), 1)) {
vboxlog_msg("Failed to modify the VBOX_USER_HOME path.");
}
#endif
}
#ifdef _WIN32
// Launch vboxsvc manually so that the DCOM subsystem won't be able too.
// Our version will have permission and direction to write
// its state information to the BOINC data directory.
// //
launch_vboxsvc(); launch_vboxsvc();
#endif #endif