diff options
| author |  crass <development@efficientek.com> | 2018-10-17 01:02:22 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-10-17 01:02:22 -0500 |
| commit | 40927dfecc4a7a7f917222e866a7b56ff4249d1b (patch) | |
| tree | a13b25eba80c7c90d31f93a88d8fa606db03d299 /etc/7z.profile | |
| parent | Merge pull request #2158 from crass/profile_conditional (diff) | |
| parent | Remove "/etc/firejail/" from all include paths, now that profile_read will se... (diff) | |
| download | firejail-40927dfecc4a7a7f917222e866a7b56ff4249d1b.tar.gz firejail-40927dfecc4a7a7f917222e866a7b56ff4249d1b.tar.zst firejail-40927dfecc4a7a7f917222e866a7b56ff4249d1b.zip | |
Merge pull request #2156 from crass/improve-include-handling
Improve include handling
Diffstat (limited to 'etc/7z.profile')
| -rw-r--r-- | etc/7z.profile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/7z.profile b/etc/7z.profile index e3f27b93f..909f3baf8 100644 --- a/etc/7z.profile +++ b/etc/7z.profile | |||
| @@ -2,10 +2,10 @@ | |||
| 2 | # This file is overwritten after every install/update | 2 | # This file is overwritten after every install/update |
| 3 | quiet | 3 | quiet |
| 4 | # Persistent local customizations | 4 | # Persistent local customizations |
| 5 | include /etc/firejail/7z.local | 5 | include 7z.local |
| 6 | # Persistent global definitions | 6 | # Persistent global definitions |
| 7 | # added by included default.profile | 7 | # added by included default.profile |
| 8 | #include /etc/firejail/globals.local | 8 | #include globals.local |
| 9 | 9 | ||
| 10 | blacklist /tmp/.X11-unix | 10 | blacklist /tmp/.X11-unix |
| 11 | 11 | ||
| @@ -22,4 +22,4 @@ tracelog | |||
| 22 | 22 | ||
| 23 | private-dev | 23 | private-dev |
| 24 | 24 | ||
| 25 | include /etc/firejail/default.profile | 25 | include default.profile |