aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Aleksey Manevich <manevich.aleksey@gmail.com>2016-09-10 21:59:20 +0300
committerLibravatar Aleksey Manevich <manevich.aleksey@gmail.com>2016-09-10 21:59:20 +0300
commit214b62cebecab39340b523880cc44994f343244b (patch)
tree6e28a41806b29a65639abcf0eacd72c7bd5e0fff /src
parentadd x11=block option (diff)
downloadfirejail-214b62cebecab39340b523880cc44994f343244b.tar.gz
firejail-214b62cebecab39340b523880cc44994f343244b.tar.zst
firejail-214b62cebecab39340b523880cc44994f343244b.zip
update man
Diffstat (limited to 'src')
-rw-r--r--src/man/firejail-profile.txt11
-rw-r--r--src/man/firejail.txt7
2 files changed, 18 insertions, 0 deletions
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 51b45cd10..d4ab0af55 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -267,6 +267,17 @@ There is no root account (uid 0) defined in the namespace.
267.TP 267.TP
268\fBx11 268\fBx11
269Enable X11 sandboxing. 269Enable X11 sandboxing.
270.TP
271\fBx11 xpra
272Enable X11 sandboxing with xpra.
273.TP
274\fBx11 xephyr
275Enable X11 sandboxing with xephyr.
276.TP
277\fBx11 block
278Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file specified in ${XAUTHORITY} enviroment variable.
279Remove DISPLAY and XAUTHORITY enviroment variables.
280Stop with error message if X11 abstract socket will be accessible in jail.
270 281
271.SH Resource limits, CPU affinity, Control Groups 282.SH Resource limits, CPU affinity, Control Groups
272These profile entries define the limits on system resources (rlimits) for the processes inside the sandbox. 283These profile entries define the limits on system resources (rlimits) for the processes inside the sandbox.
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index a5d3623b6..c05c8e201 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1673,6 +1673,13 @@ Example:
1673$ firejail \-\-x11=xephyr --net=eth0 openbox 1673$ firejail \-\-x11=xephyr --net=eth0 openbox
1674 1674
1675.TP 1675.TP
1676\fB\-\-x11=block
1677Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file specified in ${XAUTHORITY} enviroment variable.
1678Remove DISPLAY and XAUTHORITY enviroment variables.
1679Stop with error message if X11 abstract socket will be accessible in jail.
1680.br
1681
1682.TP
1676\fB\-\-zsh 1683\fB\-\-zsh
1677Use /usr/bin/zsh as default user shell. 1684Use /usr/bin/zsh as default user shell.
1678.br 1685.br