diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/x11.c | 2 | ||||
-rw-r--r-- | src/man/firecfg.txt | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c index 49af2eff4..f1d45adef 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c | |||
@@ -568,6 +568,7 @@ void x11_start_xephyr(int argc, char **argv) { | |||
568 | (void) rv; | 568 | (void) rv; |
569 | } | 569 | } |
570 | 570 | ||
571 | assert(display_str); | ||
571 | setenv("DISPLAY", display_str, 1); | 572 | setenv("DISPLAY", display_str, 1); |
572 | // run attach command | 573 | // run attach command |
573 | jail = fork(); | 574 | jail = fork(); |
@@ -785,6 +786,7 @@ void x11_start_xpra(int argc, char **argv) { | |||
785 | _exit(1); | 786 | _exit(1); |
786 | } | 787 | } |
787 | 788 | ||
789 | assert(display_str); | ||
788 | setenv("DISPLAY", display_str, 1); | 790 | setenv("DISPLAY", display_str, 1); |
789 | 791 | ||
790 | // build jail command | 792 | // build jail command |
diff --git a/src/man/firecfg.txt b/src/man/firecfg.txt index 979d4fc06..55b60dcac 100644 --- a/src/man/firecfg.txt +++ b/src/man/firecfg.txt | |||
@@ -20,16 +20,14 @@ The integration covers: | |||
20 | .br | 20 | .br |
21 | 21 | ||
22 | .br | 22 | .br |
23 | - programs started by clicking on file icons in file manager - only Cinnamon, KDE, LXDE, MATE and XFCE | 23 | - programs started by clicking on file icons in file manager - only Cinnamon, KDE, LXDE/LXQT, MATE and XFCE |
24 | desktop managers are supported in this moment | 24 | desktop managers are supported in this moment |
25 | .RE | 25 | .RE |
26 | 26 | ||
27 | This brings us as very close to full desktop integration. | 27 | To set it up, run "sudo firecfg" after installing Firejail software. |
28 | 28 | The same command should also be run after | |
29 | To set it up, run "sudo firecfg" after installing | 29 | installing new programs. If the program is supported by Firejail, the symbolic link in /usr/local/bin |
30 | Firejail software, and logout/login for the integration to take effect. "sudo firecfg" should also be run after | 30 | will be created. For a full list of programs supported by default run "cat /usr/lib/firejail/firecfg.config". |
31 | you install new programs. If the program is supported by Firejail, the symbolic link in /usr/local/bin | ||
32 | will be created. For a list of programs supported by default run "ls /etc/firejail". | ||
33 | 31 | ||
34 | For user-driven manual integration, see \fBDESKTOP INTEGRATION\fR section in \fBman 1 firejail\fR. | 32 | For user-driven manual integration, see \fBDESKTOP INTEGRATION\fR section in \fBman 1 firejail\fR. |
35 | 33 | ||