diff options
author | 2016-08-02 08:52:54 -0400 | |
---|---|---|
committer | 2016-08-02 08:52:54 -0400 | |
commit | d4757cf3b9d358cc19319294e14c9ca622f134c2 (patch) | |
tree | 197b7ca33de3692b1182d4aba5329d5348501a46 /src | |
parent | fixed make test-profile broken by previous commit (diff) | |
parent | change order of arguments to Xephyr to allow override (diff) | |
download | firejail-d4757cf3b9d358cc19319294e14c9ca622f134c2.tar.gz firejail-d4757cf3b9d358cc19319294e14c9ca622f134c2.tar.zst firejail-d4757cf3b9d358cc19319294e14c9ca622f134c2.zip |
Merge pull request #679 from manevich/xephyr
Change hardcoded Xephyr options to close window at exit of last client.
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/x11.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c index 2accaeb71..090ff6f3b 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c | |||
@@ -158,7 +158,7 @@ void fs_x11(void) { | |||
158 | 158 | ||
159 | 159 | ||
160 | #ifdef HAVE_X11 | 160 | #ifdef HAVE_X11 |
161 | //$ Xephyr -ac -br -noreset -screen 800x600 :22 & | 161 | //$ Xephyr -ac -br -terminate -screen 800x600 :22 & |
162 | //$ DISPLAY=:22 firejail --net=eth0 --blacklist=/tmp/.X11-unix/x0 firefox | 162 | //$ DISPLAY=:22 firejail --net=eth0 --blacklist=/tmp/.X11-unix/x0 firefox |
163 | void x11_start_xephyr(int argc, char **argv) { | 163 | void x11_start_xephyr(int argc, char **argv) { |
164 | EUID_ASSERT(); | 164 | EUID_ASSERT(); |
@@ -190,11 +190,11 @@ void x11_start_xephyr(int argc, char **argv) { | |||
190 | // start xephyr | 190 | // start xephyr |
191 | char *cmd1; | 191 | char *cmd1; |
192 | if (checkcfg(CFG_XEPHYR_WINDOW_TITLE)) { | 192 | if (checkcfg(CFG_XEPHYR_WINDOW_TITLE)) { |
193 | if (asprintf(&cmd1, "Xephyr -ac -br -title \"firejail x11 sandbox\" %s -noreset -screen %s :%d", xephyr_extra_params, xephyr_screen, display) == -1) | 193 | if (asprintf(&cmd1, "Xephyr -ac -br -title \"firejail x11 sandbox\" -terminate -screen %s %s :%d", xephyr_screen, xephyr_extra_params, display) == -1) |
194 | errExit("asprintf"); | 194 | errExit("asprintf"); |
195 | } | 195 | } |
196 | else { | 196 | else { |
197 | if (asprintf(&cmd1, "Xephyr -ac -br %s -noreset -screen %s :%d", xephyr_extra_params, xephyr_screen, display) == -1) | 197 | if (asprintf(&cmd1, "Xephyr -ac -br -terminate -screen %s %s :%d", xephyr_screen, xephyr_extra_params, display) == -1) |
198 | errExit("asprintf"); | 198 | errExit("asprintf"); |
199 | } | 199 | } |
200 | 200 | ||