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

nixos/grub: Fix defaultConfig

Browse Source
This commit is contained in:
William A. Kennington III 2015-05-29 12:01:50 -07:00
parent c0a5ffc438
commit d4f3930201
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -354,7 +354,7 @@ in
export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
'' + flip concatMapStrings cfg.mirroredBoots (args: '' '' + flip concatMapStrings cfg.mirroredBoots (args: ''
${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} $@
'')); ''));
system.build.grub = grub; system.build.grub = grub;

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

@ -11,7 +11,7 @@ require List::Compare;
use POSIX; use POSIX;
use Cwd; use Cwd;
my $defaultConfig = $ARGV[0] or die; my $defaultConfig = $ARGV[1] or die;
my $dom = XML::LibXML->load_xml(location => $ARGV[0]); my $dom = XML::LibXML->load_xml(location => $ARGV[0]);