install-grub.pl: support bindmounts #374398
Open
+8
−75
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
6.topic: nixos
kira-bruneau
force-pushed
the
install-grub
branch
from
c955ca5 to
548802c
Compare
|
It looks like the code in See: |
kira-bruneau
force-pushed
the
install-grub
branch
3 times, most recently
from
ca00777 to
277371b
Compare
kira-bruneau
changed the title
ofborg
bot
added
the
2.status: merge conflict
kira-bruneau
force-pushed
the
install-grub
branch
from
277371b to
437f40c
Compare
github-actions
bot
added
6.topic: python
6.topic: GNOME
github-actions
bot
removed
6.topic: vim
6.topic: hardware
6.topic: TeX
kira-bruneau
changed the title
The current implementation of GetFS uses heuristics to find the best filesystem for the given boot path. Using findmnt is more robust.
kira-bruneau
force-pushed
the
install-grub
branch
from
437f40c to
1dcd74f
Compare
kira-bruneau
commented
Jan 17, 2025
Comment on lines
-220
to
-243
|
|
||
| # BTRFS is a special case in that we need to fix the referenced path based on subvolumes | ||
| if ($fs->type eq 'btrfs') { | ||
| my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]}); | ||
| if ($status != 0) { | ||
| die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; | ||
| } | ||
| my @ids = join("\n", @id_info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s; | ||
| if ($#ids > 0) { | ||
| die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" | ||
| } elsif ($#ids == 0) { | ||
| my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "list", @{[$fs->mount]}); | ||
| if ($status != 0) { | ||
| die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n"; | ||
| } | ||
| my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/; | ||
| if ($#paths > 0) { | ||
| die "Btrfs returned multiple paths for a single subvolume id, mountpoint @{[$fs->mount]}\n"; | ||
| } elsif ($#paths != 0) { | ||
| die "Btrfs did not return a path for the subvolume at @{[$fs->mount]}\n"; | ||
| } | ||
| $path = "/$paths[0]$path"; | ||
| } | ||
| } |
There was a problem hiding this comment.
Btrfs no longer needs to be treated specially here since $fs->root will contain the subvolume path and will be resolved the same way bind mounts are resolved.
kira-bruneau
force-pushed
the
install-grub
branch
from
1dcd74f to
ce234a4
Compare
Specifically this allows bind-mounting your `/boot` directory with NixOS impermanence.
kira-bruneau
force-pushed
the
install-grub
branch
from
ce234a4 to
986445f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Specifically, this fixes grub generation when bind-mounting your
/nix&/bootdirectory with NixOS impermanence.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.