diff options
| author |  Aleksey Manevich <manevich.aleksey@gmail.com> | 2016-08-01 16:21:35 +0300 |
|---|---|---|
| committer | Aleksey Manevich <manevich.aleksey@gmail.com> | 2016-08-01 16:21:35 +0300 |
| commit | 531c3401e4ead91118e33610c97128efdc786a53 (patch) | |
| tree | 17b292426a000dae4eff8749234afc64a5014a60 | |
| parent | change Xephyr option from -noreset to -terminate (diff) | |
| download | firejail-531c3401e4ead91118e33610c97128efdc786a53.tar.gz firejail-531c3401e4ead91118e33610c97128efdc786a53.tar.zst firejail-531c3401e4ead91118e33610c97128efdc786a53.zip | |
change order of arguments to Xephyr to allow override
| -rw-r--r-- | src/firejail/x11.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c index c284bb882..090ff6f3b 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c | |||
| @@ -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 -terminate -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 -terminate -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 | ||