diff options
author | vis <vis@mailbox.org> | 2016-11-03 15:06:57 +0100 |
---|---|---|
committer | vis <vis@mailbox.org> | 2016-11-03 15:06:57 +0100 |
commit | 2aafd9bd3a96b578bf423eb8faba0efe965c52d5 (patch) | |
tree | 6ab4d26a6daad1e3972a86dbdcbe67030d710883 /src/man | |
parent | Improvements for Zathura profile (diff) | |
parent | removed warning if --quiet is enabled (diff) | |
download | firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.tar.gz firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.tar.zst firejail-2aafd9bd3a96b578bf423eb8faba0efe965c52d5.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/man')
-rw-r--r-- | src/man/firejail-login.txt | 4 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 2 | ||||
-rw-r--r-- | src/man/firejail.txt | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/man/firejail-login.txt b/src/man/firejail-login.txt index 691217253..796179d0b 100644 --- a/src/man/firejail-login.txt +++ b/src/man/firejail-login.txt | |||
@@ -13,6 +13,10 @@ Example: | |||
13 | 13 | ||
14 | netblue:--net=none --protocol=unix | 14 | netblue:--net=none --protocol=unix |
15 | 15 | ||
16 | Wildcard patterns are accepted in the user name field: | ||
17 | |||
18 | user*: --private | ||
19 | |||
16 | .SH RESTRICTED SHELL | 20 | .SH RESTRICTED SHELL |
17 | To configure a restricted shell, replace /bin/bash with /usr/bin/firejail in | 21 | To configure a restricted shell, replace /bin/bash with /usr/bin/firejail in |
18 | /etc/passwd file for each user that needs to be restricted. Alternatively, | 22 | /etc/passwd file for each user that needs to be restricted. Alternatively, |
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index d420fab7a..09dc46bbc 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -218,7 +218,7 @@ Blacklist violations logged to syslog. | |||
218 | Whitelist directory or file. A temporary file system is mounted on the top directory, and the | 218 | Whitelist directory or file. A temporary file system is mounted on the top directory, and the |
219 | whitelisted files are mount-binded inside. Modifications to whitelisted files are persistent, | 219 | whitelisted files are mount-binded inside. Modifications to whitelisted files are persistent, |
220 | everything else is discarded when the sandbox is closed. The top directory could be | 220 | everything else is discarded when the sandbox is closed. The top directory could be |
221 | user home, /dev, /media, /mnt, /opt, /var, and /tmp. | 221 | user home, /dev, /media, /mnt, /opt, /srv, /var, and /tmp. |
222 | .br | 222 | .br |
223 | 223 | ||
224 | .br | 224 | .br |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index 4aebb71e8..666a6a8ef 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -1622,7 +1622,7 @@ $ firejail \-\-net=br0 --veth-name=if0 | |||
1622 | Whitelist directory or file. A temporary file system is mounted on the top directory, and the | 1622 | Whitelist directory or file. A temporary file system is mounted on the top directory, and the |
1623 | whitelisted files are mount-binded inside. Modifications to whitelisted files are persistent, | 1623 | whitelisted files are mount-binded inside. Modifications to whitelisted files are persistent, |
1624 | everything else is discarded when the sandbox is closed. The top directory could be | 1624 | everything else is discarded when the sandbox is closed. The top directory could be |
1625 | user home, /dev, /media, /mnt, /opt, /var, and /tmp. | 1625 | user home, /dev, /media, /mnt, /opt, /srv, /var, and /tmp. |
1626 | .br | 1626 | .br |
1627 | 1627 | ||
1628 | .br | 1628 | .br |