diff options
| author |  smitsohu <smitsohu@gmail.com> | 2019-12-25 17:23:17 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-12-25 17:23:17 +0100 |
| commit | 7119cc7da54c415369ea60a1a31905c4aed34571 (patch) | |
| tree | f33ca36c35dea54ed87adb30c305023f85580231 /etc | |
| parent | Fix private-lib in gconf.profile (diff) | |
| parent | let is_ready_for_join() return a boolean (diff) | |
| download | firejail-7119cc7da54c415369ea60a1a31905c4aed34571.tar.gz firejail-7119cc7da54c415369ea60a1a31905c4aed34571.tar.zst firejail-7119cc7da54c415369ea60a1a31905c4aed34571.zip | |
Merge pull request #3093 from smitsohu/join
add join timeout and make it configurable
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/firejail.config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/firejail.config b/etc/firejail.config index 565796d5a..3bff2f7ed 100644 --- a/etc/firejail.config +++ b/etc/firejail.config | |||
| @@ -62,6 +62,11 @@ | |||
| 62 | # root user can always join sandboxes. | 62 | # root user can always join sandboxes. |
| 63 | # join yes | 63 | # join yes |
| 64 | 64 | ||
| 65 | # Timeout when joining a sandbox, default five seconds. Wait up to | ||
| 66 | # the specified period of time to allow sandbox setup to finish. | ||
| 67 | # It is not possible to join a sandbox while it is still starting up. | ||
| 68 | # join-timeout 5 | ||
| 69 | |||
| 65 | # Enable or disable sandbox name change, default enabled. | 70 | # Enable or disable sandbox name change, default enabled. |
| 66 | # name-change yes | 71 | # name-change yes |
| 67 | 72 | ||