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

nixos/etc: remove leading slash from paths #284508

Merged
merged 3 commits into from
Feb 3, 2024
Merged

nixos/etc: remove leading slash from paths #284508

merged 3 commits into from
Feb 3, 2024

Conversation

nikstur
Copy link
Contributor

@nikstur nikstur commented Jan 28, 2024

Description of changes

Fix issue reported in #270727 (comment)

  • Fix type checking and printing to stderr
  • Remove leading slashes when building the composefs dump
  • Remove leading slash from file in environment.etc defined in xserver module

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@nikstur
nixos/etc: fix type checking of build-composefs-dump.py
92b9847
@nikstur
nixos/etc: remove leading slash from target paths in build-composefs-…
a9161ce 
…dump.py

This is necessary so that duplicates in the composefs dump are avoided.
@nikstur
nixos/x11: remove leading slash from environment.etc path
dff64f5 
Even if the tools that assemble /etc can handle leading slashes, this
still is not correct. For example, you could have both /X11 and X11 in
environment.etc which makes overriding hard.
@nikstur nikstur requested review from lheckemann and xaverdh January 28, 2024 12:47
@nikstur nikstur requested a review from dasJ as a code owner January 28, 2024 12:47
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 28, 2024
@nikstur nikstur mentioned this pull request Jan 28, 2024
Merged
13 tasks
@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 Jan 28, 2024
xaverdh
xaverdh approved these changes Jan 28, 2024
View reviewed changes
Copy link
Contributor

@xaverdh xaverdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can confirm that cherry-picking 92b9847 and a9161ce (just the composefs changes) fixes the issue as well as cherry-picking dff64f5 (that changes the xserver module) individually.
LGTM

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 28, 2024
@nikstur nikstur requested a review from JulienMalka February 2, 2024 15:41
@lheckemann lheckemann merged commit 9f571cb into NixOS:master Feb 3, 2024
23 checks passed
@lheckemann
Copy link
Member

A more proper fix would probably be to disallow leading slashes via an assertion or similar, because the approach here still leaves the collision problem open ("what if both etc."resolv.conf" and etc."/resolv.conf" are defined?").

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xaverdh xaverdh xaverdh approved these changes

@2xsaiko 2xsaiko 2xsaiko left review comments

@lheckemann lheckemann lheckemann approved these changes

@dasJ dasJ Awaiting requested review from dasJ

@JulienMalka JulienMalka Awaiting requested review from JulienMalka

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nikstur @lheckemann @2xsaiko @xaverdh @delroth