diff options
author | 2018-06-24 16:20:32 +0000 | |
---|---|---|
committer | 2018-06-24 16:20:32 +0000 | |
commit | 6ee5afa31bef90cba8c661925e26af2f4a802db1 (patch) | |
tree | 01954cbce6c3f66948822e9a355a129a4fcb0c1a /etc | |
parent | Merge pull request #2012 from glitsj16/7z-redirects (diff) | |
download | firejail-6ee5afa31bef90cba8c661925e26af2f4a802db1.tar.gz firejail-6ee5afa31bef90cba8c661925e26af2f4a802db1.tar.zst firejail-6ee5afa31bef90cba8c661925e26af2f4a802db1.zip |
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
Diffstat (limited to 'etc')
-rw-r--r-- | etc/7z.profile | 3 | ||||
-rw-r--r-- | etc/gzip.profile | 3 | ||||
-rw-r--r-- | etc/less.profile | 3 | ||||
-rw-r--r-- | etc/strings.profile | 3 | ||||
-rw-r--r-- | etc/tar.profile | 3 | ||||
-rw-r--r-- | etc/unrar.profile | 3 | ||||
-rw-r--r-- | etc/unzip.profile | 3 | ||||
-rw-r--r-- | etc/uudeview.profile | 3 | ||||
-rw-r--r-- | etc/xzdec.profile | 3 |
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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/7z.local | 5 | include /etc/firejail/7z.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
10 | 11 | ||
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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/gzip.local | 5 | include /etc/firejail/gzip.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
10 | 11 | ||
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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/less.local | 5 | include /etc/firejail/less.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
10 | 11 | ||
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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/strings.local | 5 | include /etc/firejail/strings.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
10 | 11 | ||
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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/tar.local | 5 | include /etc/firejail/tar.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
10 | 11 | ||
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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/unrar.local | 5 | include /etc/firejail/unrar.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
10 | 11 | ||
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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/unzip.local | 5 | include /etc/firejail/unzip.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
10 | 11 | ||
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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/uudeview.local | 5 | include /etc/firejail/uudeview.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | hostname uudeview | 10 | hostname uudeview |
10 | ignore noroot | 11 | 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 | |||
4 | # Persistent local customizations | 4 | # Persistent local customizations |
5 | include /etc/firejail/xzdec.local | 5 | include /etc/firejail/xzdec.local |
6 | # Persistent global definitions | 6 | # Persistent global definitions |
7 | include /etc/firejail/globals.local | 7 | # added by included default.profile |
8 | #include /etc/firejail/globals.local | ||
8 | 9 | ||
9 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
10 | 11 | ||