aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorLibravatar glitsj16 <glitsj16@users.noreply.github.com>2018-06-20 17:14:09 +0000
committerLibravatar GitHub <noreply@github.com>2018-06-20 17:14:09 +0000
commit04f37cd1e167082583bc7d896c045193163c89bc (patch)
tree68c378b8c0e6687513dad29471d764257f2bb018 /etc
parentavoid including globals.local more than once (diff)
downloadfirejail-04f37cd1e167082583bc7d896c045193163c89bc.tar.gz
firejail-04f37cd1e167082583bc7d896c045193163c89bc.tar.zst
firejail-04f37cd1e167082583bc7d896c045193163c89bc.zip
avoid including globals.local more than once
Fixes https://github.com/netblue30/firejail/issues/2006
Diffstat (limited to 'etc')
-rw-r--r--etc/firefox-common.profile3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/firefox-common.profile b/etc/firefox-common.profile
index b0de1f1a3..818f24e7e 100644
--- a/etc/firefox-common.profile
+++ b/etc/firefox-common.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include /etc/firejail/firefox-common.local 4include /etc/firejail/firefox-common.local
5# Persistent global definitions 5# Persistent global definitions
6include /etc/firejail/globals.local 6# already included by caller profile
7#include /etc/firejail/globals.local
7 8
8# uncomment the following line to allow access to common programs/addons/plugins 9# uncomment the following line to allow access to common programs/addons/plugins
9#include /etc/firejail/firefox-common-addons.inc 10#include /etc/firejail/firefox-common-addons.inc