aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-05-08 10:15:15 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-05-08 10:15:15 -0400
commit38fc2f7cdbe561a18cb9bf09b92e234ec2c59f3f (patch)
tree62b2ddd8edd7506ba8e5a14c8e3d8e02a252c03a
parentfixed empty private-bin (diff)
parentundo change (diff)
downloadfirejail-38fc2f7cdbe561a18cb9bf09b92e234ec2c59f3f.tar.gz
firejail-38fc2f7cdbe561a18cb9bf09b92e234ec2c59f3f.tar.zst
firejail-38fc2f7cdbe561a18cb9bf09b92e234ec2c59f3f.zip
Merge pull request #505 from Fred-Barclay/proposed
Proposed
-rw-r--r--RELNOTES2
-rw-r--r--etc/disable-programs.inc1
-rw-r--r--etc/totem.profile3
3 files changed, 5 insertions, 1 deletions
diff --git a/RELNOTES b/RELNOTES
index 339e2ee2d..9c6aeac24 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -24,7 +24,7 @@ firejail (0.9.40-rc1) baseline; urgency=low
24 * new profiles: okular, gwenview, Google-Play-Music-Desktop-Player 24 * new profiles: okular, gwenview, Google-Play-Music-Desktop-Player
25 * new profiles: Aweather, Stellarium, gpredict, quiterss, cyberfox 25 * new profiles: Aweather, Stellarium, gpredict, quiterss, cyberfox
26 * new profiles: generic Ubuntu snap application profile, xplayer 26 * new profiles: generic Ubuntu snap application profile, xplayer
27 * new profiles: xreader, xplayer 27 * new profiles: xreader, xviewer
28 * generic.profile renamed default.profile 28 * generic.profile renamed default.profile
29 * build rpm packages using "make rpms" 29 * build rpm packages using "make rpms"
30 * bugfixes 30 * bugfixes
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 1f3768693..1e3f092fb 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -110,3 +110,4 @@ blacklist ${HOME}/.local/share/steam
110blacklist ${HOME}/.local/share/wesnoth 110blacklist ${HOME}/.local/share/wesnoth
111blacklist ${HOME}/.local/share/0ad 111blacklist ${HOME}/.local/share/0ad
112blacklist ${HOME}/.local/share/xplayer 112blacklist ${HOME}/.local/share/xplayer
113blacklsit ${HOME}/.local/share/totem
diff --git a/etc/totem.profile b/etc/totem.profile
index 4d87cbb85..d23167b03 100644
--- a/etc/totem.profile
+++ b/etc/totem.profile
@@ -1,4 +1,7 @@
1# Totem media player profile 1# Totem media player profile
2noblacklist ~/.config/totem
3noblacklist ~/.local/share/totem
4
2include /etc/firejail/disable-common.inc 5include /etc/firejail/disable-common.inc
3include /etc/firejail/disable-programs.inc 6include /etc/firejail/disable-programs.inc
4include /etc/firejail/disable-devel.inc 7include /etc/firejail/disable-devel.inc