diff options
Diffstat (limited to 'nixos/modules/installer/cd-dvd/iso-image.nix')
-rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 30610b4f426..3ff1b3d670e 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -734,13 +734,13 @@ in { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } - { source = config.isoImage.splashImage; - target = "/isolinux/background.png"; - } { source = pkgs.writeText "version" config.system.nixos.label; target = "/version.txt"; } ] ++ optionals canx86BiosBoot [ + { source = config.isoImage.splashImage; + target = "/isolinux/background.png"; + } { source = pkgs.substituteAll { name = "isolinux.cfg"; src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; @@ -761,6 +761,9 @@ in { source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/boot/grub.cfg") + "/grub"; target = "/boot/grub"; } + { source = config.isoImage.efiSplashImage; + target = "/EFI/boot/efi-background.png"; + } ] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [ { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; @@ -769,10 +772,6 @@ in { source = config.isoImage.grubTheme; target = "/EFI/boot/grub-theme"; } - ] ++ [ - { source = config.isoImage.efiSplashImage; - target = "/EFI/boot/efi-background.png"; - } ]; boot.loader.timeout = 10; |