public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make install-grub.pl work when $PATH is empty

Browse Source
This commit is contained in:
Eelco Dolstra 2012-11-15 22:54:43 +01:00
parent f44d27a96c
commit 1f401a0e35
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/system/boot/loader/grub/grub.nix
View File

@ -18,6 +18,7 @@ let
version extraConfig extraPerEntryConfig extraEntries version extraConfig extraPerEntryConfig extraEntries
extraEntriesBeforeNixOS configurationLimit copyKernels timeout extraEntriesBeforeNixOS configurationLimit copyKernels timeout
default devices; default devices;
path = makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.findutils pkgs.gnugrep ];
}); });
in in

1
modules/system/boot/loader/grub/install-grub.pl
View File

@ -38,6 +38,7 @@ my $configurationLimit = int(get("configurationLimit"));
my $copyKernels = get("copyKernels") eq "true"; my $copyKernels = get("copyKernels") eq "true";
my $timeout = int(get("timeout")); my $timeout = int(get("timeout"));
my $defaultEntry = int(get("default")); my $defaultEntry = int(get("default"));
$ENV{'PATH'} = get("path");
die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;