From ed8a025c1f079145bf38109981ab136a356da9e0 Mon Sep 17 00:00:00 2001 From: startx2017 Date: Wed, 17 May 2017 10:21:09 -0400 Subject: merged 0.9.46-bugfixes on mainline following 0.9.46 release --- src/firejail/x11.c | 2 ++ src/man/firecfg.txt | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') 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) { (void) rv; } + assert(display_str); setenv("DISPLAY", display_str, 1); // run attach command jail = fork(); @@ -785,6 +786,7 @@ void x11_start_xpra(int argc, char **argv) { _exit(1); } + assert(display_str); setenv("DISPLAY", display_str, 1); // 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: .br .br -- programs started by clicking on file icons in file manager - only Cinnamon, KDE, LXDE, MATE and XFCE +- programs started by clicking on file icons in file manager - only Cinnamon, KDE, LXDE/LXQT, MATE and XFCE desktop managers are supported in this moment .RE -This brings us as very close to full desktop integration. - -To set it up, run "sudo firecfg" after installing -Firejail software, and logout/login for the integration to take effect. "sudo firecfg" should also be run after -you install new programs. If the program is supported by Firejail, the symbolic link in /usr/local/bin -will be created. For a list of programs supported by default run "ls /etc/firejail". +To set it up, run "sudo firecfg" after installing Firejail software. +The same command should also be run after +installing new programs. If the program is supported by Firejail, the symbolic link in /usr/local/bin +will be created. For a full list of programs supported by default run "cat /usr/lib/firejail/firecfg.config". For user-driven manual integration, see \fBDESKTOP INTEGRATION\fR section in \fBman 1 firejail\fR. -- cgit v1.2.3-70-g09d2