[PR #3093] [MERGED] add join timeout and make it configurable #4640

Closed
opened 2026-05-05 10:23:51 -06:00 by gitea-mirror · 0 comments
Owner

📋 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: masterHead: join


📝 Commits (6)

  • 0d2ec26 move invalid_sandbox function to join module
  • 34b39fd let join wait if target sandbox is not ready yet
  • 0bfd118 make join timeout configurable in firejail.config
  • 25b869d cleanup
  • 0899195 simplify join timeout
  • 6bb06fe let 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.

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/3093 **Author:** [@smitsohu](https://github.com/smitsohu) **Created:** 12/23/2019 **Status:** ✅ Merged **Merged:** 12/25/2019 **Merged by:** [@smitsohu](https://github.com/smitsohu) **Base:** `master` ← **Head:** `join` --- ### 📝 Commits (6) - [`0d2ec26`](https://github.com/netblue30/firejail/commit/0d2ec2682a599f4e321e57cef0a10e8d1de025ac) move invalid_sandbox function to join module - [`34b39fd`](https://github.com/netblue30/firejail/commit/34b39fd486af4e2f586d20fcea275940a5df41e9) let join wait if target sandbox is not ready yet - [`0bfd118`](https://github.com/netblue30/firejail/commit/0bfd11891300cb59bd9b995b956f5a57c8a3458c) make join timeout configurable in firejail.config - [`25b869d`](https://github.com/netblue30/firejail/commit/25b869d47e46b6d33d2e3d6a3b5be31fbf69285e) cleanup - [`0899195`](https://github.com/netblue30/firejail/commit/089919539b656a0a802f8cd2098f1ce33f3911fb) simplify join timeout - [`6bb06fe`](https://github.com/netblue30/firejail/commit/6bb06fe038f1ad43427dcd547733e8f6c3667316) let is_ready_for_join() return a boolean ### 📊 Changes **11 files changed** (+122 additions, -183 deletions) <details> <summary>View changed files</summary> 📝 `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) </details> ### 📄 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 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
gitea-mirror 2026-05-05 10:23:51 -06:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#4640
No description provided.