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/filesystems: don't allow mountpoints with trailing slash #95406

Merged
merged 1 commit into from Jan 31, 2021
Merged

nixos/filesystems: don't allow mountpoints with trailing slash #95406

merged 1 commit into from Jan 31, 2021

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Aug 14, 2020 •
edited

They are semantically the same as the non-slash version and therefore
are potential source of duplicates.

Also fixes #78951

Alternative to #78951

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@Mic92 Mic92 mentioned this pull request Aug 14, 2020
Closed
10 tasks
lheckemann
lheckemann requested changes Aug 14, 2020
View reviewed changes
Copy link
Member

@lheckemann lheckemann left a comment

Choose a reason for hiding this comment

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

I like the principle, but the regexes could be simpler I think.

nixos/modules/tasks/filesystems.nix Outdated Show resolved Hide resolved
nixos/modules/tasks/filesystems.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

@Mic92 ping

@Mic92 Mic92 force-pushed the mountpoint-type branch 2 times, most recently from 1e1ee86 to 480725a Compare January 23, 2021 16:29
@Mic92
Copy link
Member Author

Mic92 commented Jan 23, 2021

Done.

@Atemu
Copy link
Member

Atemu commented Jan 24, 2021

Small nit but your commit message references my issue, not my alternative PR.

Also, hasn't this been merged already? f536901
I'm confused.

@Mic92
Copy link
Member Author

Mic92 commented Jan 25, 2021

Small nit but your commit message references my issue, not my alternative PR.

Also, hasn't this been merged already? f536901
I'm confused.

No at some I accidentally push my local staging branch instead of my upstream staging copy where I merged in master to resolve merge conflicts. I reverted those commits.

@Mic92
nixos/filesystems: don't allow mountpoints with trailing slash
76360c0 
They are semantically the same as the non-slash version and therefore
are potential source of duplicates.

Also fixes NixOS#78951

Alternative to NixOS#95308
@Mic92
Copy link
Member Author

Mic92 commented Jan 25, 2021

/marvin opt-in
/status needs_reviewer

@marvin-mk2 marvin-mk2 bot added the marvin label Jan 25, 2021
@marvin-mk2
Copy link

marvin-mk2 bot commented Jan 25, 2021

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@marvin-mk2
Copy link

marvin-mk2 bot commented Jan 30, 2021

Reminder: Please review!

This Pull Request is awaiting review. If you are the assigned reviewer, please have a look. Try to find another reviewer if necessary. If you can't, please say so. If the status is not accurate, please change it. If nothing happens, this PR will be should be put back in the needs_reviewer queue in one day.

Note: This feature is currently broken. The bot will not actually change the status. If you see this message multiple times, please request a status change manually.

@Mic92
Copy link
Member Author

Mic92 commented Jan 30, 2021

/status needs_reviewer

@marvin-mk2 marvin-mk2 bot requested a review from kevincox January 31, 2021 00:45
@kevincox kevincox merged commit 969e43e into NixOS:master Jan 31, 2021
@Mic92 Mic92 deleted the mountpoint-type branch January 31, 2021 11:41
@jakobrs jakobrs mentioned this pull request May 27, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lheckemann lheckemann lheckemann approved these changes

@kevincox kevincox kevincox approved these changes

@vikanezrimaya vikanezrimaya Awaiting requested review from vikanezrimaya

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 awaiting_reviewer marvin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Mounting the nix store on /nix/ fails but /nix works
5 participants
@Mic92 @SuperSandro2000 @Atemu @lheckemann @kevincox