diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-04-25 00:17:31 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-04-25 00:55:22 +0000 |
commit | 24600635755cea965bf21b1b1073076d7bfd498a (patch) | |
tree | 2bfdaef0b6469ce9f2302b5452356ef7089f1c67 /nixos | |
parent | cf68bb33cb797d4e6802ef5f3e6b68715fca1e7b (diff) | |
download | nixlib-24600635755cea965bf21b1b1073076d7bfd498a.tar nixlib-24600635755cea965bf21b1b1073076d7bfd498a.tar.gz nixlib-24600635755cea965bf21b1b1073076d7bfd498a.tar.bz2 nixlib-24600635755cea965bf21b1b1073076d7bfd498a.tar.lz nixlib-24600635755cea965bf21b1b1073076d7bfd498a.tar.xz nixlib-24600635755cea965bf21b1b1073076d7bfd498a.tar.zst nixlib-24600635755cea965bf21b1b1073076d7bfd498a.zip |
nixos: installer: cleanup a bit
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 83f8a2586bd3..08923970cd38 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -73,7 +73,8 @@ let APPEND ${toString config.boot.loader.grub.memtest86.params} ''; - isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + isolinuxCfg = concatStringsSep "\n" + ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); # The EFI boot image. efiDir = pkgs.runCommand "efi-directory" {} '' |