diff options
| author |  netblue30 <netblue30@yahoo.com> | 2018-06-22 04:41:06 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-22 04:41:06 -0500 |
| commit | edfefbe194ea0ff7a8fa9939e0dece61bea9ca5b (patch) | |
| tree | 7eab6b0280b51f175b538cd56b3874f200eb874c | |
| parent | disable flatpak directories (diff) | |
| parent | avoid including globals.local more than once (diff) | |
| download | firejail-edfefbe194ea0ff7a8fa9939e0dece61bea9ca5b.tar.gz firejail-edfefbe194ea0ff7a8fa9939e0dece61bea9ca5b.tar.zst firejail-edfefbe194ea0ff7a8fa9939e0dece61bea9ca5b.zip | |
Merge pull request #2007 from glitsj16/globals.local
include globals.local only once
| -rw-r--r-- | etc/chromium-common.profile | 3 | ||||
| -rw-r--r-- | etc/discord-common.profile | 3 | ||||
| -rw-r--r-- | etc/firefox-common.profile | 3 |
3 files changed, 6 insertions, 3 deletions
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 @@ | |||
| 3 | # Persistent local customizations | 3 | # Persistent local customizations |
| 4 | include /etc/firejail/chromium-common.local | 4 | include /etc/firejail/chromium-common.local |
| 5 | # Persistent global definitions | 5 | # Persistent global definitions |
| 6 | include /etc/firejail/globals.local | 6 | # already included by caller profile |
| 7 | #include /etc/firejail/globals.local | ||
| 7 | 8 | ||
| 8 | noblacklist ${HOME}/.pki | 9 | noblacklist ${HOME}/.pki |
| 9 | 10 | ||
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 @@ | |||
| 3 | # Persistent local customizations | 3 | # Persistent local customizations |
| 4 | include /etc/firejail/discord-common.local | 4 | include /etc/firejail/discord-common.local |
| 5 | # Persistent global definitions | 5 | # Persistent global definitions |
| 6 | include /etc/firejail/globals.local | 6 | # already included by caller profile |
| 7 | #include /etc/firejail/globals.local | ||
| 7 | 8 | ||
| 8 | include /etc/firejail/disable-common.inc | 9 | include /etc/firejail/disable-common.inc |
| 9 | include /etc/firejail/disable-devel.inc | 10 | include /etc/firejail/disable-devel.inc |
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 |
| 4 | include /etc/firejail/firefox-common.local | 4 | include /etc/firejail/firefox-common.local |
| 5 | # Persistent global definitions | 5 | # Persistent global definitions |
| 6 | include /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 |