mirror of
https://github.com/netblue30/firejail.git
synced 2026-05-15 14:16:14 -06:00
[PR #3093] [MERGED] add join timeout and make it configurable #4640
Labels
No labels
LTS merge
LTS merge
bug
bug
converted-to-discussion
doc-todo
documentation
duplicate
enhancement
file-transfer
firecfg
firejail-in-firejail
firetools
graphics
help wanted
information_old
installation
invalid
modif
moved
needinfo
networking
notabug
notourbug
old-version
overlayfs
packaging
profile-request
pull-request
question
question_old
removal
runtime-permissions
sandbox-ipc
security
stale
wiki
wiki
wontfix
wordpress
workaround
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: github-starred/firejail#4640
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/netblue30/firejail/pull/3093
Author: @smitsohu
Created: 12/23/2019
Status: ✅ Merged
Merged: 12/25/2019
Merged by: @smitsohu
Base:
master← Head:join📝 Commits (6)
0d2ec26move invalid_sandbox function to join module34b39fdlet join wait if target sandbox is not ready yet0bfd118make join timeout configurable in firejail.config25b869dcleanup0899195simplify join timeout6bb06felet is_ready_for_join() return a boolean📊 Changes
11 files changed (+122 additions, -183 deletions)
View changed files
📝
etc/firejail.config(+5 -0)📝
src/firejail/caps.c(+2 -15)📝
src/firejail/checkcfg.c(+6 -0)📝
src/firejail/cpu.c(+1 -3)📝
src/firejail/firejail.h(+3 -1)📝
src/firejail/join.c(+95 -26)📝
src/firejail/ls.c(+2 -15)📝
src/firejail/network_main.c(+2 -15)📝
src/firejail/protocol.c(+2 -15)📝
src/firejail/seccomp.c(+2 -15)📝
src/firejail/util.c(+2 -78)📄 Description
per this patch, firejail tries for 5 seconds to join a sandbox, and only then exits with an error. I'm not sure if the defaults are chosen wisely, you may want to adjust both the default timeout and the frequency of the checks (every 100 msec currently)
see #2139
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.