diff options
author | 2021-11-29 01:47:56 -0300 | |
---|---|---|
committer | 2021-11-29 21:42:14 -0300 | |
commit | 6ddedeba011fa32e005112cc4655bddbd7ce1e9f (patch) | |
tree | b93f63a91ff1838db17c6d4aa01c34ceebf7cc9d /src | |
parent | Keep render, lp, input and other groups regardless of nogroups (diff) | |
download | firejail-6ddedeba011fa32e005112cc4655bddbd7ce1e9f.tar.gz firejail-6ddedeba011fa32e005112cc4655bddbd7ce1e9f.tar.zst firejail-6ddedeba011fa32e005112cc4655bddbd7ce1e9f.zip |
Make nogroups work on nvidia again
Remove workaround from commit 623e68216 ("temporary fix for
nvidia/nogroups/noroot issue (#3644, #841)", 2020-10-02) and from commit
cb460c32c ("more nvidia (#3644)", 2020-10-03).
The handling of the "render" and "video" groups is separate from
`nogroups` now, so disabling `nogroups` on nvidia shouldn't be necessary
anymore. See the previous 2 commits for details.
See also the discussion on PR #4632.
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/profile.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index b8bb086d2..756b370aa 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -416,13 +416,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
416 | return 0; | 416 | return 0; |
417 | } | 417 | } |
418 | else if (strcmp(ptr, "nogroups") == 0) { | 418 | else if (strcmp(ptr, "nogroups") == 0) { |
419 | // nvidia cards require video group; disable nogroups | 419 | arg_nogroups = 1; |
420 | if (access("/dev/nvidiactl", R_OK) == 0 && arg_no3d == 0) { | ||
421 | fwarning("Warning: NVIDIA card detected, nogroups command disabled\n"); | ||
422 | arg_nogroups = 0; | ||
423 | } | ||
424 | else | ||
425 | arg_nogroups = 1; | ||
426 | return 0; | 420 | return 0; |
427 | } | 421 | } |
428 | else if (strcmp(ptr, "nosound") == 0) { | 422 | else if (strcmp(ptr, "nosound") == 0) { |