don't include globals.local twice (take two) (#2010)

* avoid including globals.local twice

* avoid including globals.local twice

* avoid including globals.local twice

* avoid including globals.local twice

* avoid including globals.local twice

* avoid including globals.local twice

* avoid including globals.local twice

* avoid including globals.local twice

* avoid including globals.local twice

9 files changed, 18 insertions, 9 deletions

diff --git a/etc/7z.profile b/etc/7z.profile
index 0330e4dbf..e3f27b93f 100644
--- a/etc/7z.profile
+++ b/etc/7z.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/7z.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 blacklist /tmp/.X11-unix
 
diff --git a/etc/gzip.profile b/etc/gzip.profile
index 779067770..33892e5c9 100644
--- a/etc/gzip.profile
+++ b/etc/gzip.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/gzip.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 blacklist /tmp/.X11-unix
 
diff --git a/etc/less.profile b/etc/less.profile
index fd0f84c71..2b5449a7b 100644
--- a/etc/less.profile
+++ b/etc/less.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/less.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 blacklist /tmp/.X11-unix
 
diff --git a/etc/strings.profile b/etc/strings.profile
index 8995ad2a6..5bea9525f 100644
--- a/etc/strings.profile
+++ b/etc/strings.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/strings.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 blacklist /tmp/.X11-unix
 
diff --git a/etc/tar.profile b/etc/tar.profile
index 5f54bf02d..35dbb3378 100644
--- a/etc/tar.profile
+++ b/etc/tar.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/tar.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 blacklist /tmp/.X11-unix
 
diff --git a/etc/unrar.profile b/etc/unrar.profile
index ba2a86f4c..40ee277e0 100644
--- a/etc/unrar.profile
+++ b/etc/unrar.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/unrar.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 blacklist /tmp/.X11-unix
 
diff --git a/etc/unzip.profile b/etc/unzip.profile
index 95c27e976..1a1142fe8 100644
--- a/etc/unzip.profile
+++ b/etc/unzip.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/unzip.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 blacklist /tmp/.X11-unix
 
diff --git a/etc/uudeview.profile b/etc/uudeview.profile
index d09cbd97a..f71f0150d 100644
--- a/etc/uudeview.profile
+++ b/etc/uudeview.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/uudeview.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 hostname uudeview
 ignore noroot
diff --git a/etc/xzdec.profile b/etc/xzdec.profile
index 5913fd07a..93b6d5093 100644
--- a/etc/xzdec.profile
+++ b/etc/xzdec.profile
@@ -4,7 +4,8 @@ quiet
 # Persistent local customizations
 include /etc/firejail/xzdec.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included default.profile
+#include /etc/firejail/globals.local
 
 blacklist /tmp/.X11-unix