snap-confine: Only attempt to copy/mount NVIDIA libs when NVIDIA is used #3975
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
This hasn't _yet_ presented an issue in full confinement environments, as the only fully confined environment available is Ubuntu, and the snaps being tested are also built using the Ubuntu libraries. This change will now only make the NVIDIA libraries available if the nvidia kernel module is loaded and present, to ensure that confined snaps running on open source drivers will not run into any linking issues by exposing the host GL library into the runtime. Signed-off-by: Ikey Doherty <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #3975 +/- ##
==========================================
+ Coverage 75.97% 75.98% +<.01%
==========================================
Files 423 423
Lines 36505 36505
==========================================
+ Hits 27734 27737 +3
+ Misses 6833 6830 -3
Partials 1938 1938
Continue to review full report at Codecov.
|
mvo5
approved these changes
Sep 28, 2017
| @@ -33,6 +33,8 @@ | |||
| #include "../libsnap-confine-private/string-utils.h" | |||
| #include "../libsnap-confine-private/utils.h" | |||
|
|
|||
| #define SC_NVIDIA_DRIVER_VERSION_FILE "/sys/module/nvidia/version" | |||
There was a problem hiding this comment.
How stable is this name? For how long is iit available?
There was a problem hiding this comment.
We are already using it and it is present in all the driver versions out there.
There was a problem hiding this comment.
Ya I just moved the existing define in the file to be available where I need it, but the name is stable for loaded kernel module.
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.
This hasn't yet presented an issue in full confinement environments,
as the only fully confined environment available is Ubuntu, and the snaps
being tested are also built using the Ubuntu libraries.
This change will now only make the NVIDIA libraries available if the nvidia
kernel module is loaded and present, to ensure that confined snaps running
on open source drivers will not run into any linking issues by exposing the
host GL library into the runtime.
Signed-off-by: Ikey Doherty [email protected]