diff options
| author |  valoq <valoq@mailbox.org> | 2016-10-26 17:51:07 +0200 |
|---|---|---|
| committer | valoq <valoq@mailbox.org> | 2016-10-26 17:51:07 +0200 |
| commit | ad773dec65ec32e0fcba1b123b3da5b9edcbf9d4 (patch) | |
| tree | 0e35dd6dc35f3c8d5ea32a6c076e270524b3db36 /etc/strings.profile | |
| parent | removed blacklist duplate (diff) | |
| parent | removed ping blacklisting (diff) | |
| download | firejail-ad773dec65ec32e0fcba1b123b3da5b9edcbf9d4.tar.gz firejail-ad773dec65ec32e0fcba1b123b3da5b9edcbf9d4.tar.zst firejail-ad773dec65ec32e0fcba1b123b3da5b9edcbf9d4.zip | |
resolve conflict
Diffstat (limited to 'etc/strings.profile')
| -rw-r--r-- | etc/strings.profile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/strings.profile b/etc/strings.profile index f99a65009..7c464bf88 100644 --- a/etc/strings.profile +++ b/etc/strings.profile | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | # strings profile | 1 | # strings profile |
| 2 | quiet | ||
| 3 | ignore noroot | 2 | ignore noroot |
| 4 | include /etc/firejail/default.profile | 3 | include /etc/firejail/default.profile |
| 5 | tracelog | 4 | |
| 6 | net none | 5 | net none |
| 7 | shell none | ||
| 8 | private-dev | ||
| 9 | nosound | 6 | nosound |
| 7 | quiet | ||
| 8 | shell none | ||
| 9 | tracelog | ||
| 10 | 10 | ||
| 11 | private-dev | ||