diff options
-rw-r--r-- | etc/disable-programs.inc | 1 | ||||
-rw-r--r-- | etc/mpd.profile | 3 | ||||
-rw-r--r-- | src/man/firejail.txt | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index 1565187b0..f7cc1ce94 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -441,6 +441,7 @@ blacklist ${HOME}/.mcabberrc | |||
441 | blacklist ${HOME}/.mediathek3 | 441 | blacklist ${HOME}/.mediathek3 |
442 | blacklist ${HOME}/.minetest | 442 | blacklist ${HOME}/.minetest |
443 | blacklist ${HOME}/.mozilla | 443 | blacklist ${HOME}/.mozilla |
444 | blacklist ${HOME}/.mpd | ||
444 | blacklist ${HOME}/.mpdconf | 445 | blacklist ${HOME}/.mpdconf |
445 | blacklist ${HOME}/.mplayer | 446 | blacklist ${HOME}/.mplayer |
446 | blacklist ${HOME}/.msmtprc | 447 | blacklist ${HOME}/.msmtprc |
diff --git a/etc/mpd.profile b/etc/mpd.profile index 3ed5fe307..7f3e42e08 100644 --- a/etc/mpd.profile +++ b/etc/mpd.profile | |||
@@ -5,8 +5,9 @@ include /etc/firejail/mpd.local | |||
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | include /etc/firejail/globals.local |
7 | 7 | ||
8 | noblacklist ${HOME}/.mpdconf | ||
9 | noblacklist ${HOME}/.config/mpd | 8 | noblacklist ${HOME}/.config/mpd |
9 | noblacklist ${HOME}/.mpd | ||
10 | noblacklist ${HOME}/.mpdconf | ||
10 | 11 | ||
11 | include /etc/firejail/disable-common.inc | 12 | include /etc/firejail/disable-common.inc |
12 | include /etc/firejail/disable-devel.inc | 13 | include /etc/firejail/disable-devel.inc |
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index d89a763a9..e55d01253 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -468,7 +468,7 @@ Example: | |||
468 | $ firejail \-\-env=LD_LIBRARY_PATH=/opt/test/lib | 468 | $ firejail \-\-env=LD_LIBRARY_PATH=/opt/test/lib |
469 | 469 | ||
470 | .TP | 470 | .TP |
471 | \fB\-\-fs.print=name|print | 471 | \fB\-\-fs.print=name|pid |
472 | Print the filesystem log for the sandbox identified by name or by PID. | 472 | Print the filesystem log for the sandbox identified by name or by PID. |
473 | .br | 473 | .br |
474 | 474 | ||
@@ -633,7 +633,7 @@ If a program is specified, the program is run in the sandbox. This command is av | |||
633 | Security filters, cgroups and cpus configurations are not applied to the process joining the sandbox. | 633 | Security filters, cgroups and cpus configurations are not applied to the process joining the sandbox. |
634 | 634 | ||
635 | .TP | 635 | .TP |
636 | \fB\-\-join-network=name|PID | 636 | \fB\-\-join-network=name|pid |
637 | Join the network namespace of the sandbox identified by name. By default a /bin/bash shell is started after joining the sandbox. | 637 | Join the network namespace of the sandbox identified by name. By default a /bin/bash shell is started after joining the sandbox. |
638 | If a program is specified, the program is run in the sandbox. This command is available only to root user. | 638 | If a program is specified, the program is run in the sandbox. This command is available only to root user. |
639 | Security filters, cgroups and cpus configurations are not applied to the process joining the sandbox. Example: | 639 | Security filters, cgroups and cpus configurations are not applied to the process joining the sandbox. Example: |
@@ -1772,7 +1772,7 @@ Example: | |||
1772 | $ firejail \-\-shell=none \-\-seccomp.keep=poll,select,[...] transmission-gtk | 1772 | $ firejail \-\-shell=none \-\-seccomp.keep=poll,select,[...] transmission-gtk |
1773 | 1773 | ||
1774 | .TP | 1774 | .TP |
1775 | \fB\-\-seccomp.print=name|PID | 1775 | \fB\-\-seccomp.print=name|pid |
1776 | Print the seccomp filter for the sandbox identified by name or PID. | 1776 | Print the seccomp filter for the sandbox identified by name or PID. |
1777 | .br | 1777 | .br |
1778 | 1778 | ||
@@ -1957,7 +1957,7 @@ shell. | |||
1957 | Example: | 1957 | Example: |
1958 | $firejail \-\-shell=/bin/dash script.sh | 1958 | $firejail \-\-shell=/bin/dash script.sh |
1959 | .TP | 1959 | .TP |
1960 | \fB\-\-shutdown=name|PID | 1960 | \fB\-\-shutdown=name|pid |
1961 | Shutdown the sandbox identified by name or PID. | 1961 | Shutdown the sandbox identified by name or PID. |
1962 | .br | 1962 | .br |
1963 | 1963 | ||