Fixup 36 profiles

1 files changed, 7 insertions, 21 deletions

diff --git a/etc/tor-browser-en.profile b/etc/tor-browser-en.profile
index 1f0b61c75..65ea41e18 100644
--- a/etc/tor-browser-en.profile
+++ b/etc/tor-browser-en.profile
@@ -5,26 +5,15 @@ include /etc/firejail/tor-browser-en.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
-blacklist /boot
-blacklist /media
-blacklist /mnt
-blacklist /opt
-blacklist /usr/local/bin
-blacklist /var
+
+noblacklist ${HOME}/.tor-browser-en
+
+include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-devel.inc
+include /etc/firejail/disable-passwdmgr.inc
+include /etc/firejail/disable-programs.inc
 
 whitelist ${HOME}/.tor-browser-en
-whitelist /dev/dri
-whitelist /dev/full
-whitelist /dev/null
-whitelist /dev/ptmx
-whitelist /dev/pts
-whitelist /dev/random
-whitelist /dev/shm
-whitelist /dev/snd
-whitelist /dev/tty
-whitelist /dev/urandom
-whitelist /dev/video0
-whitelist /dev/zero
 include /etc/firejail/whitelist-common.inc
 
 caps.drop all
@@ -33,9 +22,6 @@ seccomp
 shell none
 
 private-bin bash,grep,sed,tail,tor-browser-en,env,id,readlink,dirname,test,mkdir,ln,sed,cp,rm,getconf,file,expr
-# FIXME: Spoof D-Bus machine id (tor-browser segfaults when it is missing!)
-# https://github.com/netblue30/firejail/issues/955
-private-etc X11,pulse,machine-id
 private-tmp
 
 noexec /tmp