movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge pull request #113887 from xaverdh/install-grub-editorconfig-fixup

Browse source
This commit is contained in:
Sandro 2021-11-29 21:03:41 +01:00 • committed by GitHub
commit 61c3243dc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 88 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/system/boot/loader/grub/install-grub.pl
View file

@ -106,7 +106,7 @@ struct(Fs => {
device => '$', device => '$',
type => '$', type => '$',
mount => '$', mount => '$',
}); });
sub PathInMount { sub PathInMount {
my ($path, $mount) = @_; my ($path, $mount) = @_;
my @splitMount = split /\//, $mount; my @splitMount = split /\//, $mount;
@ -157,7 +157,7 @@ sub GetFs {
struct (Grub => { struct (Grub => {
path => '$', path => '$',
search => '$', search => '$',
}); });
my $driveid = 1; my $driveid = 1;
sub GrubFs { sub GrubFs {
my ($dir) = @_; my ($dir) = @_;
@ -659,7 +659,7 @@ struct(GrubState => {
devices => '$', devices => '$',
efiMountPoint => '$', efiMountPoint => '$',
extraGrubInstallArgs => '@', extraGrubInstallArgs => '@',
}); });
# If you add something to the state file, only add it to the end # If you add something to the state file, only add it to the end
# because it is read line-by-line. # because it is read line-by-line.
sub readGrubState { sub readGrubState {