From 7877f27bbe65c5d175a1d7ad50fc16d683e1ac50 Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Wed, 20 Jun 2018 17:10:21 +0000 Subject: avoid including globals.local more than once Fixes https://github.com/netblue30/firejail/issues/2006 --- etc/chromium-common.profile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/chromium-common.profile b/etc/chromium-common.profile index 8b25f4e60..c8132cd0f 100644 --- a/etc/chromium-common.profile +++ b/etc/chromium-common.profile @@ -3,7 +3,8 @@ # Persistent local customizations include /etc/firejail/chromium-common.local # Persistent global definitions -include /etc/firejail/globals.local +# already included by caller profile +#include /etc/firejail/globals.local noblacklist ${HOME}/.pki -- cgit v1.2.3-54-g00ecf From 16575b8b15644bdc7b2e2278b13ff7ae0308a7b7 Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Wed, 20 Jun 2018 17:12:22 +0000 Subject: avoid including globals.local more than once Fixes https://github.com/netblue30/firejail/issues/2006 --- etc/discord-common.profile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/discord-common.profile b/etc/discord-common.profile index 5cd8d6bb6..65a307681 100644 --- a/etc/discord-common.profile +++ b/etc/discord-common.profile @@ -3,7 +3,8 @@ # Persistent local customizations include /etc/firejail/discord-common.local # Persistent global definitions -include /etc/firejail/globals.local +# already included by caller profile +#include /etc/firejail/globals.local include /etc/firejail/disable-common.inc include /etc/firejail/disable-devel.inc -- cgit v1.2.3-54-g00ecf From 04f37cd1e167082583bc7d896c045193163c89bc Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Wed, 20 Jun 2018 17:14:09 +0000 Subject: avoid including globals.local more than once Fixes https://github.com/netblue30/firejail/issues/2006 --- etc/firefox-common.profile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 @@ # Persistent local customizations include /etc/firejail/firefox-common.local # Persistent global definitions -include /etc/firejail/globals.local +# already included by caller profile +#include /etc/firejail/globals.local # uncomment the following line to allow access to common programs/addons/plugins #include /etc/firejail/firefox-common-addons.inc -- cgit v1.2.3-54-g00ecf