[PR #4690] [MERGED] Fix inconsistent descriptions of machine-id option #5226

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

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/4690
Author: @kmk3
Created: 11/15/2021
Status: Merged
Merged: 11/15/2021
Merged by: @netblue30

Base: masterHead: docs-fix-machine-id


📝 Commits (1)

  • b5de1d0 Fix inconsistent descriptions of machine-id option

📊 Changes

4 files changed (+4 additions, -4 deletions)

View changed files

📝 src/firejail/firejail.h (+1 -1)
📝 src/firejail/main.c (+1 -1)
📝 src/firejail/usage.c (+1 -1)
📝 src/zsh_completion/_firejail.in (+1 -1)

📄 Description

Some places say that it "preserves" the file and other places say that
it "spoofs" the file. Based on the fs_machineid function on
src/firejail/fs_etc.c, the latter one is correct.

This amends commit d0cc960c9 ("spoof machine-id", 2016-12-05).

Fixes #4689.

Reported-by: @svc88


🔄 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/4690 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 11/15/2021 **Status:** ✅ Merged **Merged:** 11/15/2021 **Merged by:** [@netblue30](https://github.com/netblue30) **Base:** `master` ← **Head:** `docs-fix-machine-id` --- ### 📝 Commits (1) - [`b5de1d0`](https://github.com/netblue30/firejail/commit/b5de1d0f910cbb1c4dae98957e7846731162e696) Fix inconsistent descriptions of machine-id option ### 📊 Changes **4 files changed** (+4 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `src/firejail/firejail.h` (+1 -1) 📝 `src/firejail/main.c` (+1 -1) 📝 `src/firejail/usage.c` (+1 -1) 📝 `src/zsh_completion/_firejail.in` (+1 -1) </details> ### 📄 Description Some places say that it "preserves" the file and other places say that it "spoofs" the file. Based on the fs_machineid function on src/firejail/fs_etc.c, the latter one is correct. This amends commit d0cc960c9 ("spoof machine-id", 2016-12-05). Fixes #4689. Reported-by: @svc88 --- <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:34:32 -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#5226
No description provided.