diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-29 12:01:50 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-29 13:26:32 -0700 |
| commit | d4f3930201895534ccaa9ce4c5411ffb3da9fc51 (patch) | |
| tree | 77c9955792a80ca528342b80bb72bb784e62a713 /nixos/modules/system/boot/loader | |
| parent | c0a5ffc438b70598c868787723f55257032113f3 (diff) | |
| download | nixlib-d4f3930201895534ccaa9ce4c5411ffb3da9fc51.tar nixlib-d4f3930201895534ccaa9ce4c5411ffb3da9fc51.tar.gz nixlib-d4f3930201895534ccaa9ce4c5411ffb3da9fc51.tar.bz2 nixlib-d4f3930201895534ccaa9ce4c5411ffb3da9fc51.tar.lz nixlib-d4f3930201895534ccaa9ce4c5411ffb3da9fc51.tar.xz nixlib-d4f3930201895534ccaa9ce4c5411ffb3da9fc51.tar.zst nixlib-d4f3930201895534ccaa9ce4c5411ffb3da9fc51.zip | |
nixos/grub: Fix defaultConfig
Diffstat (limited to 'nixos/modules/system/boot/loader')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c790e05f51bd..1fb2e20949a0 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -354,7 +354,7 @@ in export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} '' + 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; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index a0384d23f821..3ca30b58023b 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -11,7 +11,7 @@ require List::Compare; use POSIX; use Cwd; -my $defaultConfig = $ARGV[0] or die; +my $defaultConfig = $ARGV[1] or die; my $dom = XML::LibXML->load_xml(location => $ARGV[0]); |