aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2019-05-30 09:08:54 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2019-05-30 09:08:54 -0400
commitbb18e513ae92ebf78529bfbb89f33986b57240aa (patch)
tree42e0b4532c237b97e12d2c1bb45ab583298fce1a /src
parentmerging - man pages: add FIREJAIL_QUIET (diff)
downloadfirejail-bb18e513ae92ebf78529bfbb89f33986b57240aa.tar.gz
firejail-bb18e513ae92ebf78529bfbb89f33986b57240aa.tar.zst
firejail-bb18e513ae92ebf78529bfbb89f33986b57240aa.zip
merge update man pages (private-dev, noexec)
Diffstat (limited to 'src')
-rw-r--r--src/man/firejail-profile.txt5
-rw-r--r--src/man/firejail.txt6
2 files changed, 6 insertions, 5 deletions
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 92e95f165..36db61ed1 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -210,8 +210,9 @@ Mount an empty temporary filesystem on top of the .cache directory in user home.
210modifications are discarded when the sandbox is closed. 210modifications are discarded when the sandbox is closed.
211.TP 211.TP
212\fBprivate-dev 212\fBprivate-dev
213Create a new /dev directory. Only disc, dri, null, full, zero, tty, pts, ptmx, 213Create a new /dev directory. Only disc, dri, dvb, hidraw, null, full, zero, tty, pts, ptmx,
214random, snd, urandom, video, log and shm devices are available. 214random, snd, urandom, video, log, shm and usb devices are available.
215Use the options no3d, nodvd, nosound, notv, nou2f and novideo for additional restrictions.
215.TP 216.TP
216\fBkeep-dev-shm 217\fBkeep-dev-shm
217/dev/shm directory is untouched (even with private-dev). 218/dev/shm directory is untouched (even with private-dev).
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index b8f8a22e9..fd1d4a6be 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1038,8 +1038,7 @@ $ firejail \-\-noexec=/tmp
1038.br 1038.br
1039 1039
1040.br 1040.br
1041/etc and /var are noexec by default if the sandbox was started as a regular user. If there are more than one mount operation 1041/etc and /var are noexec by default if the sandbox was started as a regular user.
1042on the path of the file or directory, noexec should be applied to the last one. Always check if the change took effect inside the sandbox.
1043 1042
1044.TP 1043.TP
1045\fB\-\-nogroups 1044\fB\-\-nogroups
@@ -1215,7 +1214,8 @@ $ firejail \-\-private-cache openbox
1215 1214
1216.TP 1215.TP
1217\fB\-\-private-dev 1216\fB\-\-private-dev
1218Create a new /dev directory. Only disc, dri, null, full, zero, tty, pts, ptmx, random, snd, urandom, video, log and shm devices are available. 1217Create a new /dev directory. Only disc, dri, dvb, hidraw, null, full, zero, tty, pts, ptmx, random, snd, urandom, video, log, shm and usb devices are available.
1218Use the options --no3d, --nodvd, --nosound, --notv, --nou2f and --novideo for additional restrictions.
1219.br 1219.br
1220 1220
1221.br 1221.br