diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-04-20 01:32:42 -0400 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-05-01 19:48:57 -0400 |
| commit | 20d0824b150492d4b484954c64aad9f24656c130 (patch) | |
| tree | fefe83466d174c099c97ae4e8b4405196533d6a4 /nixos/modules | |
| parent | d999e2544b65bfa52877da34a7b40316868a0a26 (diff) | |
| download | nixpkgs-20d0824b150492d4b484954c64aad9f24656c130.tar nixpkgs-20d0824b150492d4b484954c64aad9f24656c130.tar.gz nixpkgs-20d0824b150492d4b484954c64aad9f24656c130.tar.bz2 nixpkgs-20d0824b150492d4b484954c64aad9f24656c130.tar.lz nixpkgs-20d0824b150492d4b484954c64aad9f24656c130.tar.xz nixpkgs-20d0824b150492d4b484954c64aad9f24656c130.tar.zst nixpkgs-20d0824b150492d4b484954c64aad9f24656c130.zip | |
iso-image: Fix grub file load location
With U-Boot UEFI, (hd0) is not the USB drive, it is (cd0). Though, it turns out we never needed to prefix the path!
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 1418420afcd..e73bb883df5 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -186,7 +186,7 @@ let # Fonts can be loaded? # (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. # input is "console", while output is "gfxterm". # 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. if config.isoImage.grubTheme != null then '' # Sets theme. - set theme=(hd0)/EFI/boot/grub-theme/theme.txt + set theme=/EFI/boot/grub-theme/theme.txt # 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 '' - 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 # is a background image set... This seems undocumented :( set color_normal=black/black |