vboxwrapper: don't create projects/virtualbox #5658
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If Vboxwrapper couldn't find the Vbox 'home dir' (normally ~/.VirtualBox)
based on env vars, it would create one: projects/virtualbox
(owned by boinc_projects, not boinc_master)
This is wrong because
1) on startup, the client deletes anything in projects/
that's not a project directory
2) on Mac it causes installer error messages
because the dir is not owned by boinc_master.
Fix: don't create projects/virtualbox.
AenBleidd
approved these changes
Jun 16, 2024
|
@computezrmle, could you please review this change? |
| @@ -100,7 +100,9 @@ int VBOX_VM::initialize() { | |||
| } | |||
| #endif | |||
|
|
|||
| // Determine the VirtualBox home directory. Overwrite as needed. | |||
| // Determine the VirtualBox home directory. | |||
| // NOTE: I'm not sure this is relevant; see | |||
There was a problem hiding this comment.
virtualbox_home_directory is used to locate VBoxSVC.log in vbox_common.cpp.
Hence, yes it needs to be set.
|
The docs mention different directories to put It looks like the patch covers the situation on Windows only. On Linux and Oracle Solaris |
|
Other than the comment, is the change OK? |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5658 +/- ##
============================================
- Coverage 10.53% 10.53% -0.01%
Complexity 1068 1068
============================================
Files 279 279
Lines 35868 35874 +6
Branches 8409 8412 +3
============================================
Hits 3780 3780
- Misses 31694 31700 +6
Partials 394 394 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If Vboxwrapper couldn't find the Vbox 'home dir' (normally ~/.VirtualBox) based on env vars, it would create one: projects/virtualbox (owned by boinc_projects, not boinc_master)
This is wrong because
that's not a project directory
because the dir is not owned by boinc_master.
Fix: don't create projects/virtualbox.