merge: Avoid including globals.local twice

9 files changed, 17 insertions, 10 deletions

diff --git a/etc/acat.profile b/etc/acat.profile
index 08593585c..23d09cb46 100644
--- a/etc/acat.profile
+++ b/etc/acat.profile
@@ -3,7 +3,8 @@
 # Persistent local customizations
 include /etc/firejail/acat.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included profile
+#include /etc/firejail/globals.local
 
 # Redirect
 include /etc/firejail/atool.profile
diff --git a/etc/adiff.profile b/etc/adiff.profile
index 2c114d765..f13482719 100644
--- a/etc/adiff.profile
+++ b/etc/adiff.profile
@@ -3,7 +3,8 @@
 # Persistent local customizations
 include /etc/firejail/adiff.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included profile
+#include /etc/firejail/globals.local
 
 # Redirect
 include /etc/firejail/atool.profile
diff --git a/etc/als.profile b/etc/als.profile
index 8cd9a9182..b2d80803c 100644
--- a/etc/als.profile
+++ b/etc/als.profile
@@ -3,7 +3,8 @@
 # Persistent local customizations
 include /etc/firejail/als.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included profile
+#include /etc/firejail/globals.local
 
 # Redirect
 include /etc/firejail/atool.profile
diff --git a/etc/apack.profile b/etc/apack.profile
index ad44b227e..e0f360745 100644
--- a/etc/apack.profile
+++ b/etc/apack.profile
@@ -3,7 +3,8 @@
 # Persistent local customizations
 include /etc/firejail/apack.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included profile
+#include /etc/firejail/globals.local
 
 # Redirect
 include /etc/firejail/atool.profile
diff --git a/etc/arepack.profile b/etc/arepack.profile
index f7a9f724a..926a6f53d 100644
--- a/etc/arepack.profile
+++ b/etc/arepack.profile
@@ -3,7 +3,8 @@
 # Persistent local customizations
 include /etc/firejail/arepack.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included profile
+#include /etc/firejail/globals.local
 
 # Redirect
 include /etc/firejail/atool.profile
diff --git a/etc/aunpack.profile b/etc/aunpack.profile
index 4f03ac60d..793dd0977 100644
--- a/etc/aunpack.profile
+++ b/etc/aunpack.profile
@@ -3,7 +3,8 @@
 # Persistent local customizations
 include /etc/firejail/aunpack.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included profile
+#include /etc/firejail/globals.local
 
 # Redirect
 include /etc/firejail/atool.profile
diff --git a/etc/bunzip2.profile b/etc/bunzip2.profile
index f483a1d3d..951a53935 100644
--- a/etc/bunzip2.profile
+++ b/etc/bunzip2.profile
@@ -3,7 +3,8 @@
 # Persistent local customizations
 include /etc/firejail/bunzip2.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included profile
+#include /etc/firejail/globals.local
 
 # Redirect
 include /etc/firejail/gzip.profile
diff --git a/etc/gunzip.profile b/etc/gunzip.profile
index 8ea523df7..c3e2f11e0 100644
--- a/etc/gunzip.profile
+++ b/etc/gunzip.profile
@@ -3,7 +3,8 @@
 # Persistent local customizations
 include /etc/firejail/gunzip.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+# added by included profile
+#include /etc/firejail/globals.local
 
 # Redirect
 include /etc/firejail/gzip.profile
diff --git a/status b/status
index 58f5cdc49..6f1823530 100644
--- a/status
+++ b/status
@@ -3,8 +3,7 @@ todo: Dec 17: join: also check proc file to detect nonewprivs bit
 todo: Sort items alphabetically in man firejail #2479, Feb 26
 todo: Alphabetical ordering of firecfg.config #2544, Mar 8
 todo: Fix incorrect parsing of --keep-var-tmp command #2587
-todo: Avoid including globals.local twice, #2586
-todo: Fix typo's in firecfg util.c #2627
+Mar 13: Avoid including globals.local twice, #2586
 Mar 10: fix --list reporting for sandboxes using --x11=none; to be ported Mar 10
 Mar 10: checking for invalid chars in profile filename before any other proce…
 todo: documentation update - Feb 23