[PR #2156] [MERGED] Improve include handling #4186

New issue

Closed

opened 2026-05-05 10:15:19 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:15:19 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/2156
Author: @crass
Created: 10/9/2018
Status: ✅ Merged
Merged: 10/17/2018
Merged by: @crass

Base: master ← Head: improve-include-handling

📝 Commits (3)

07a01b1 Allow include to search userdir then systemdir for "bare" profile file names.
b343481 Update profile manpage to detail added "include" functionality.
7c533c9 Remove "/etc/firejail/" from all include paths, now that profile_read will search for the file.

📊 Changes

608 files changed (+3424 additions, -3415 deletions)

View changed files

📝 etc/0ad.profile (+8 -8)
📝 etc/2048-qt.profile (+9 -9)
📝 etc/7z.profile (+3 -3)
📝 etc/7za.profile (+3 -3)
📝 etc/7zr.profile (+3 -3)
📝 etc/Cryptocat.profile (+7 -7)
📝 etc/Cyberfox.profile (+1 -1)
📝 etc/Discord.profile (+3 -3)
📝 etc/DiscordCanary.profile (+3 -3)
📝 etc/FossaMail.profile (+1 -1)
📝 etc/Fritzing.profile (+9 -9)
📝 etc/Gitter.profile (+1 -1)
📝 etc/JDownloader.profile (+10 -10)
📝 etc/Mathematica.profile (+8 -8)
📝 etc/Natron.profile (+1 -1)
📝 etc/QMediathekView.profile (+8 -8)
📝 etc/Telegram.profile (+1 -1)
📝 etc/Thunar.profile (+7 -7)
📝 etc/Viber.profile (+8 -8)
📝 etc/VirtualBox.profile (+1 -1)

...and 80 more files

📄 Description

This relies on pull #2152. It should be referenced for the initial commentary on these commits. So the last two pertain to this pull request.

The third commit enhances the include directive to allow specifying just the filename component of a profile path and searching the userdir and then system config dir for the file to include.

And the fourth commit did sed -i 's#include /etc/firejail/#include #' etc/* to use the behavior of the third commit. This makes it simple to "hook" various include directives without needing write access to SYSCONFDIR, which is especially useful for globals.local.

_{🔄 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/2156 **Author:** [@crass](https://github.com/crass) **Created:** 10/9/2018 **Status:** ✅ Merged **Merged:** 10/17/2018 **Merged by:** [@crass](https://github.com/crass) **Base:** `master` ← **Head:** `improve-include-handling` --- ### 📝 Commits (3) - [`07a01b1`](https://github.com/netblue30/firejail/commit/07a01b1f4503ad5681771e2b4c5307db597f81f8) Allow include to search userdir then systemdir for "bare" profile file names. - [`b343481`](https://github.com/netblue30/firejail/commit/b343481c8fb415e91c082aaa4e9319bfcaa9e0a6) Update profile manpage to detail added "include" functionality. - [`7c533c9`](https://github.com/netblue30/firejail/commit/7c533c9aa5aa9d36d51c512bb175059353eae113) Remove "/etc/firejail/" from all include paths, now that profile_read will search for the file. ### 📊 Changes **608 files changed** (+3424 additions, -3415 deletions) <details> <summary>View changed files</summary> 📝 `etc/0ad.profile` (+8 -8) 📝 `etc/2048-qt.profile` (+9 -9) 📝 `etc/7z.profile` (+3 -3) 📝 `etc/7za.profile` (+3 -3) 📝 `etc/7zr.profile` (+3 -3) 📝 `etc/Cryptocat.profile` (+7 -7) 📝 `etc/Cyberfox.profile` (+1 -1) 📝 `etc/Discord.profile` (+3 -3) 📝 `etc/DiscordCanary.profile` (+3 -3) 📝 `etc/FossaMail.profile` (+1 -1) 📝 `etc/Fritzing.profile` (+9 -9) 📝 `etc/Gitter.profile` (+1 -1) 📝 `etc/JDownloader.profile` (+10 -10) 📝 `etc/Mathematica.profile` (+8 -8) 📝 `etc/Natron.profile` (+1 -1) 📝 `etc/QMediathekView.profile` (+8 -8) 📝 `etc/Telegram.profile` (+1 -1) 📝 `etc/Thunar.profile` (+7 -7) 📝 `etc/Viber.profile` (+8 -8) 📝 `etc/VirtualBox.profile` (+1 -1) _...and 80 more files_ </details> ### 📄 Description This relies on pull #2152. It should be referenced for the initial commentary on these commits. So the last two pertain to this pull request. The third commit enhances the `include` directive to allow specifying just the filename component of a profile path and searching the userdir and then system config dir for the file to include. And the fourth commit did `sed -i 's#include /etc/firejail/#include #' etc/*` to use the behavior of the third commit. This makes it simple to "hook" various include directives without needing write access to `SYSCONFDIR`, which is especially useful for `globals.local`. --- <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:15:19 -06:00

closed this issue
added the
pull-request
label

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#4186

No description provided.

Rows
Columns