diff options
| author |  glitsj16 <glitsj16@users.noreply.github.com> | 2018-06-24 16:20:32 +0000 |
|---|---|---|
| committer |  Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2018-06-24 16:20:32 +0000 |
| commit | 6ee5afa31bef90cba8c661925e26af2f4a802db1 (patch) | |
| tree | 01954cbce6c3f66948822e9a355a129a4fcb0c1a /etc/tar.profile | |
| 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/tar.profile')
| -rw-r--r-- | etc/tar.profile | 3 |
1 files changed, 2 insertions, 1 deletions
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 | ||