Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

all firejail local includes should look in /etc/firejail #72004

Closed
wants to merge 1 commit into from
Closed

all firejail local includes should look in /etc/firejail #72004

wants to merge 1 commit into from
+1 −1

Conversation

bergey
Copy link
Contributor

@bergey bergey commented Oct 26, 2019

Motivation for this change

Firejail profiles that ship with Firejail are intended to be overridden by files in /etc/firejail, named like /etc/firejail/chromium.local. NixOS needs to jump through some extra hoops, since the base profiles end up in /nix/store, but user profiles go in /etc/firejail.

This updates the regex written by @peterhoeg in 04bbb2a to match all included .local files, not only /firejail/.*.local

The firejail package does not have any .local files, so it should be
safe to replace all these includes with the absolute path /etc/firejail/*.local.

For reference, I'm adding this local config: bergey/dotfiles@c1b69c9

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @7c6f434c

Sorry, something went wrong.

@bergey
all firejail local includes should look in /etc/firejail
0d58801 
The firejail package does not have any .local files, so it should be
safe to replace all these includes with the absolute path /etc/firejail/*.local.
bergey added a commit to bergey/dotfiles that referenced this pull request Oct 26, 2019
@bergey
overlay firejail patch
80e2489 
pending NixOS/nixpkgs#72004
@ofborg ofborg bot requested a review from 7c6f434c October 26, 2019 03:25
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 26, 2019
@7c6f434c
Copy link
Member

@GrahamcOfBorg build firejail
@GrahamcOfBorg test firejail

@stale
Copy link

stale bot commented Jun 1, 2020

Thank you for your contributions.
This has been automatically marked as stale because it has had no activity for 180 days.
If this is still important to you, we ask that you leave a comment below. Your comment can be as simple as "still important to me". This lets people see that at least one person still cares about this. Someone will have to do this at most twice a year if there is no other activity.
Here are suggestions that might help resolve this more quickly:

  1. Search for maintainers and people that previously touched the
    related code and @ mention them in a comment.
  2. Ask on the NixOS Discourse. 3. Ask on the #nixos channel on
    irc.freenode.net.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 1, 2020
@peterhoeg peterhoeg self-assigned this Jun 1, 2020
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 1, 2020
@peterhoeg
Copy link
Member

@bergey, any chance you can fix the merge conflict?

@bergey
Copy link
Contributor Author

bergey commented Jun 2, 2020

Will do, this weekend or perhaps Friday.

@bergey
Copy link
Contributor Author

bergey commented Jun 2, 2020

Looking more closely, I believe the change in a63f6a7d4797754c354054ca3af240d90295af2e which brings the merge conflict also achieves the goal of this PR. Feel free to reopen if there's a known bug with the current version.

@bergey bergey closed this Jun 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c

Assignees

@peterhoeg peterhoeg

Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bergey @7c6f434c @peterhoeg