diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-27 17:30:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 17:30:51 -0500 |
| commit | 1c9dc7daa1105f59f22ff2741e28217dfa16cc3d (patch) | |
| tree | 1244c6f1248effde1e12656d9f33b9d6bba09898 /nixos | |
| parent | df3566c9560b3305bd33faf4bc7580dc55f4f71e (diff) | |
| parent | 24600635755cea965bf21b1b1073076d7bfd498a (diff) | |
| download | nixlib-1c9dc7daa1105f59f22ff2741e28217dfa16cc3d.tar nixlib-1c9dc7daa1105f59f22ff2741e28217dfa16cc3d.tar.gz nixlib-1c9dc7daa1105f59f22ff2741e28217dfa16cc3d.tar.bz2 nixlib-1c9dc7daa1105f59f22ff2741e28217dfa16cc3d.tar.lz nixlib-1c9dc7daa1105f59f22ff2741e28217dfa16cc3d.tar.xz nixlib-1c9dc7daa1105f59f22ff2741e28217dfa16cc3d.tar.zst nixlib-1c9dc7daa1105f59f22ff2741e28217dfa16cc3d.zip | |
Merge pull request #39459 from oxij/nixos/isolinux
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" {} '' |