Redo mencoder as extending mplayer profile

1 files changed, 3 insertions, 16 deletions

diff --git a/etc/mencoder.profile b/etc/mencoder.profile
index 6ba3023ef..9306d268e 100644
--- a/etc/mencoder.profile
+++ b/etc/mencoder.profile
@@ -4,9 +4,8 @@
 # Persistent local customizations
 include /etc/firejail/mencoder.local
 # Persistent global definitions
-include /etc/firejail/globals.local
-
-noblacklist ${HOME}/.mplayer
+# added by included profile
+#include /etc/firejail/globals.local
 
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-devel.inc
@@ -14,14 +13,9 @@ include /etc/firejail/disable-interpreters.inc
 include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 
-# apparmor
-caps.drop all
 net none
 no3d
 nodbus
-nogroups
-nonewprivs
-noroot
 nosound
 notv
 nou2f
@@ -29,13 +23,6 @@ protocol unix
 seccomp
 shell none
 
-disable-mnt
 private-bin mencoder
-private-cache
-private-dev
-private-etc mplayer
-private-tmp
 
-memory-deny-write-execute
-noexec ${HOME}
-noexec /tmp
+include /etc/firejail/mplayer.profile