aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorLibravatar glitsj16 <glitsj16@users.noreply.github.com>2019-03-13 18:45:37 +0000
committerLibravatar GitHub <noreply@github.com>2019-03-13 18:45:37 +0000
commit71c6959fba6eafe633e583bf7c54cdeeabf24a7d (patch)
treeaee50d879c39013a1ea9e21593f25d04a2b06502 /etc
parentUpdate firejail.txt (#2585) (diff)
downloadfirejail-71c6959fba6eafe633e583bf7c54cdeeabf24a7d.tar.gz
firejail-71c6959fba6eafe633e583bf7c54cdeeabf24a7d.tar.zst
firejail-71c6959fba6eafe633e583bf7c54cdeeabf24a7d.zip
Avoid including globals.local twice (#2586)
* Update aunpack.profile * Update acat.profile * Update adiff.profile * Update als.profile * Update apack.profile * Update arepack.profile * Update gzip.profile * Update bunzip2.profile * Update gunzip.profile
Diffstat (limited to 'etc')
-rw-r--r--etc/acat.profile3
-rw-r--r--etc/adiff.profile3
-rw-r--r--etc/als.profile3
-rw-r--r--etc/apack.profile3
-rw-r--r--etc/arepack.profile3
-rw-r--r--etc/aunpack.profile3
-rw-r--r--etc/bunzip2.profile3
-rw-r--r--etc/gunzip.profile3
-rw-r--r--etc/gzip.profile3
9 files changed, 17 insertions, 10 deletions
diff --git a/etc/acat.profile b/etc/acat.profile
index 0b4579035..f35adf3dc 100644
--- a/etc/acat.profile
+++ b/etc/acat.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include acat.local 4include acat.local
5# Persistent global definitions 5# Persistent global definitions
6include globals.local 6# added by included profile
7#include globals.local
7 8
8# Redirect 9# Redirect
9include atool.profile 10include atool.profile
diff --git a/etc/adiff.profile b/etc/adiff.profile
index 9073b1477..f22a27e79 100644
--- a/etc/adiff.profile
+++ b/etc/adiff.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include adiff.local 4include adiff.local
5# Persistent global definitions 5# Persistent global definitions
6include globals.local 6# added by included profile
7#include globals.local
7 8
8# Redirect 9# Redirect
9include atool.profile 10include atool.profile
diff --git a/etc/als.profile b/etc/als.profile
index 24b8b976b..aa7f29337 100644
--- a/etc/als.profile
+++ b/etc/als.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include als.local 4include als.local
5# Persistent global definitions 5# Persistent global definitions
6include globals.local 6# added by included profile
7#include globals.local
7 8
8# Redirect 9# Redirect
9include atool.profile 10include atool.profile
diff --git a/etc/apack.profile b/etc/apack.profile
index bd5e49a01..b09d3d718 100644
--- a/etc/apack.profile
+++ b/etc/apack.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include apack.local 4include apack.local
5# Persistent global definitions 5# Persistent global definitions
6include globals.local 6# added by included profile
7#include globals.local
7 8
8# Redirect 9# Redirect
9include atool.profile 10include atool.profile
diff --git a/etc/arepack.profile b/etc/arepack.profile
index f5584b2be..d23fc21db 100644
--- a/etc/arepack.profile
+++ b/etc/arepack.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include arepack.local 4include arepack.local
5# Persistent global definitions 5# Persistent global definitions
6include globals.local 6# added by included profile
7#include globals.local
7 8
8# Redirect 9# Redirect
9include atool.profile 10include atool.profile
diff --git a/etc/aunpack.profile b/etc/aunpack.profile
index cde9473e3..c119ed9ad 100644
--- a/etc/aunpack.profile
+++ b/etc/aunpack.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include aunpack.local 4include aunpack.local
5# Persistent global definitions 5# Persistent global definitions
6include globals.local 6# added by included profile
7#include globals.local
7 8
8# Redirect 9# Redirect
9include atool.profile 10include atool.profile
diff --git a/etc/bunzip2.profile b/etc/bunzip2.profile
index 891476cb1..82c0f6ed6 100644
--- a/etc/bunzip2.profile
+++ b/etc/bunzip2.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include bunzip2.local 4include bunzip2.local
5# Persistent global definitions 5# Persistent global definitions
6include globals.local 6# added by included profile
7#include globals.local
7 8
8# Redirect 9# Redirect
9include gzip.profile 10include gzip.profile
diff --git a/etc/gunzip.profile b/etc/gunzip.profile
index fe35f8fe7..aff990ec0 100644
--- a/etc/gunzip.profile
+++ b/etc/gunzip.profile
@@ -3,7 +3,8 @@
3# Persistent local customizations 3# Persistent local customizations
4include gunzip.local 4include gunzip.local
5# Persistent global definitions 5# Persistent global definitions
6include globals.local 6# added by included profile
7#include globals.local
7 8
8# Redirect 9# Redirect
9include gzip.profile 10include gzip.profile
diff --git a/etc/gzip.profile b/etc/gzip.profile
index 1dbc661a1..49c43a49c 100644
--- a/etc/gzip.profile
+++ b/etc/gzip.profile
@@ -5,8 +5,7 @@ quiet
5# Persistent local customizations 5# Persistent local customizations
6include gzip.local 6include gzip.local
7# Persistent global definitions 7# Persistent global definitions
8# added by included profile 8include globals.local
9#include globals.local
10 9
11blacklist /tmp/.X11-unix 10blacklist /tmp/.X11-unix
12 11