summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-05-01 21:28:10 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-05-01 21:28:10 -0400
commit7c38c3c0262dcc1ec4d69743376f36e7108e76bf (patch)
tree31a98fef6566c2c720db5171c9dd89871ff24648 /etc
parentFix conffiles typo (diff)
downloadfirejail-7c38c3c0262dcc1ec4d69743376f36e7108e76bf.tar.gz
firejail-7c38c3c0262dcc1ec4d69743376f36e7108e76bf.tar.zst
firejail-7c38c3c0262dcc1ec4d69743376f36e7108e76bf.zip
fix trash functionality for file managers
Diffstat (limited to 'etc')
-rw-r--r--etc/Thunar.profile1
-rw-r--r--etc/caja.profile1
-rw-r--r--etc/disable-common.inc12
-rw-r--r--etc/nemo.profile2
-rw-r--r--etc/pcmanfm.profile2
5 files changed, 15 insertions, 3 deletions
diff --git a/etc/Thunar.profile b/etc/Thunar.profile
index 405e45504..0511fbdd7 100644
--- a/etc/Thunar.profile
+++ b/etc/Thunar.profile
@@ -5,6 +5,7 @@ include /etc/firejail/Thunar.local
5# Firejail profile for thunar 5# Firejail profile for thunar
6noblacklist ~/.config/Thunar 6noblacklist ~/.config/Thunar
7noblacklist ~/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml 7noblacklist ~/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
8noblacklist ${HOME}/.local/share/Trash
8 9
9include /etc/firejail/disable-common.inc 10include /etc/firejail/disable-common.inc
10#include /etc/firejail/disable-programs.inc 11#include /etc/firejail/disable-programs.inc
diff --git a/etc/caja.profile b/etc/caja.profile
index b54e4af57..8994f39fd 100644
--- a/etc/caja.profile
+++ b/etc/caja.profile
@@ -9,6 +9,7 @@ include /etc/firejail/caja.local
9 9
10noblacklist ~/.config/caja 10noblacklist ~/.config/caja
11noblacklist ~/.local/share/caja 11noblacklist ~/.local/share/caja
12noblacklist ${HOME}/.local/share/Trash
12 13
13include /etc/firejail/disable-common.inc 14include /etc/firejail/disable-common.inc
14# caja needs to be able to start arbitrary applications so we cannot blacklist their files 15# caja needs to be able to start arbitrary applications so we cannot blacklist their files
diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index 521fed37d..1c1b298a9 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -181,13 +181,19 @@ read-only ${HOME}/.gem
181read-only ${HOME}/.luarocks 181read-only ${HOME}/.luarocks
182read-only ${HOME}/.npm-packages 182read-only ${HOME}/.npm-packages
183 183
184###########################
185# The following block breaks trash functionality in file managers
186##########################
184# Make the contents of ~/.local read-only, 187# Make the contents of ~/.local read-only,
185# except the commonly-used ~/.local/share, 188# except the commonly-used ~/.local/share,
186# but including ~/.local/share/applications 189# but including ~/.local/share/applications
187read-only ${HOME}/.local 190#read-only ${HOME}/.local
188read-write ${HOME}/.local/share 191#read-write ${HOME}/.local/share
189noexec ${HOME}/.local/share 192#noexec ${HOME}/.local/share
190read-only ${HOME}/.local/share/applications 193read-only ${HOME}/.local/share/applications
194blacklist ${HOME}/.local/share/Trash
195
196
191 197
192# top secret 198# top secret
193blacklist ${HOME}/.ecryptfs 199blacklist ${HOME}/.ecryptfs
diff --git a/etc/nemo.profile b/etc/nemo.profile
index 4ebcd952c..eb0e79aed 100644
--- a/etc/nemo.profile
+++ b/etc/nemo.profile
@@ -4,6 +4,8 @@ include /etc/firejail/nemo.local
4 4
5noblacklist ${HOME}/.local/share/nemo 5noblacklist ${HOME}/.local/share/nemo
6noblacklist ${HOME}/.config/nemo 6noblacklist ${HOME}/.config/nemo
7noblacklist ${HOME}/.local/share/Trash
8
7include /etc/firejail/disable-common.inc 9include /etc/firejail/disable-common.inc
8include /etc/firejail/disable-passwdmgr.inc 10include /etc/firejail/disable-passwdmgr.inc
9include /etc/firejail/disable-devel.inc 11include /etc/firejail/disable-devel.inc
diff --git a/etc/pcmanfm.profile b/etc/pcmanfm.profile
index 00ae787a4..8c4b22c5a 100644
--- a/etc/pcmanfm.profile
+++ b/etc/pcmanfm.profile
@@ -4,6 +4,8 @@ include /etc/firejail/pcmanfm.local
4 4
5noblacklist ~/.config/pcmanfm 5noblacklist ~/.config/pcmanfm
6noblacklist ~/.config/libfm 6noblacklist ~/.config/libfm
7noblacklist ${HOME}/.local/share/Trash
8
7include /etc/firejail/disable-common.inc 9include /etc/firejail/disable-common.inc
8#include /etc/firejail/disable-programs.inc 10#include /etc/firejail/disable-programs.inc
9include /etc/firejail/disable-devel.inc 11include /etc/firejail/disable-devel.inc