public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iso-image: Fix grub file load location

Browse Source 
With U-Boot UEFI, (hd0) is not the USB drive, it is (cd0).

Though, it turns out we never needed to prefix the path!
This commit is contained in:
Samuel Dionne-Riel 2021-04-20 01:32:42 -04:00
parent d999e2544b
commit 20d0824b15
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/installer/cd-dvd/iso-image.nix
View File

@ -186,7 +186,7 @@ let
# Fonts can be loaded? # Fonts can be loaded?
# (This font is assumed to always be provided as a fallback by NixOS) # (This font is assumed to always be provided as a fallback by NixOS)
if loadfont (hd0)/EFI/boot/unicode.pf2; then if loadfont /EFI/boot/unicode.pf2; then
# Use graphical term, it can be either with background image or a theme. # Use graphical term, it can be either with background image or a theme.
# input is "console", while output is "gfxterm". # input is "console", while output is "gfxterm".
# This enables "serial" input and output only when possible. # This enables "serial" input and output only when possible.
@ -207,11 +207,11 @@ let
${ # When there is a theme configured, use it, otherwise use the background image. ${ # When there is a theme configured, use it, otherwise use the background image.
if config.isoImage.grubTheme != null then '' if config.isoImage.grubTheme != null then ''
# Sets theme. # Sets theme.
set theme=(hd0)/EFI/boot/grub-theme/theme.txt set theme=/EFI/boot/grub-theme/theme.txt
# Load theme fonts # Load theme fonts
$(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (hd0)/EFI/boot/grub-theme/%P\n") $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont /EFI/boot/grub-theme/%P\n")
'' else '' '' else ''
if background_image (hd0)/EFI/boot/efi-background.png; then if background_image /EFI/boot/efi-background.png; then
# Black background means transparent background when there # Black background means transparent background when there
# is a background image set... This seems undocumented :( # is a background image set... This seems undocumented :(
set color_normal=black/black set color_normal=black/black