From 80ec892b740b187eda41df438cb8ff29dd224da1 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 26 Nov 2024 07:56:33 -0500 Subject: [PATCH] Revert "nixos/iso-image: fix isoImage.grubTheme = null; logic" --- nixos/modules/installer/cd-dvd/iso-image.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 724421c0d910..63abf88cab09 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -335,13 +335,12 @@ let set textmode=true terminal_output console } - '' + lib.optionalString (config.isoImage.grubTheme != null) '' hiddenentry 'GUI mode' --hotkey 'g' { $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/BOOT/grub-theme/%P\n") set textmode=false terminal_output gfxterm } - '' + '' + # If the parameter iso_path is set, append the findiso parameter to the kernel # line. We need this to allow the nixos iso to be booted from grub directly.