Merge branch 'master' of ssh://github.com/netblue30/firejail

1 files changed, 12 insertions, 0 deletions

diff --git a/etc/profile-a-l/feh.profile b/etc/profile-a-l/feh.profile
index 82b3f7645..2efd10ba2 100644
--- a/etc/profile-a-l/feh.profile
+++ b/etc/profile-a-l/feh.profile
@@ -7,23 +7,33 @@ include feh.local
 # Persistent global definitions
 include globals.local
 
+noblacklist ${HOME}/.config/feh
+
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
 include disable-interpreters.inc
+include disable-proc.inc
 include disable-programs.inc
 include disable-shell.inc
 
+include whitelist-run-common.inc
+include whitelist-runuser-common.inc
+
 # Add the next line to your feh.local to enable network access.
 #include feh-network.inc.profile
 
+apparmor
 caps.drop all
+ipc-namespace
+machine-id
 net none
 no3d
 nodvd
 nogroups
 noinput
 nonewprivs
+noprinters
 noroot
 nosound
 notv
@@ -31,6 +41,8 @@ nou2f
 novideo
 protocol unix
 seccomp
+seccomp.block-secondary
+tracelog
 
 private-bin feh,jpegexiforient,jpegtran
 private-cache