diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-23 00:46:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 00:46:52 -0400 |
| commit | f753852e11d72c05cb74d1058ea8b7f6d5dd4748 (patch) | |
| tree | 51621e7ce697e13d81796c4ee26991dfc37dc475 | |
| parent | bd13ef5944a01f02006bcd4caafaaeba6a52d323 (diff) | |
| parent | 845ae983f6033338d89927d65fbfd7f28d91b16e (diff) | |
| download | nixlib-f753852e11d72c05cb74d1058ea8b7f6d5dd4748.tar nixlib-f753852e11d72c05cb74d1058ea8b7f6d5dd4748.tar.gz nixlib-f753852e11d72c05cb74d1058ea8b7f6d5dd4748.tar.bz2 nixlib-f753852e11d72c05cb74d1058ea8b7f6d5dd4748.tar.lz nixlib-f753852e11d72c05cb74d1058ea8b7f6d5dd4748.tar.xz nixlib-f753852e11d72c05cb74d1058ea8b7f6d5dd4748.tar.zst nixlib-f753852e11d72c05cb74d1058ea8b7f6d5dd4748.zip | |
Merge pull request #47196 from xeji/p/iso-boot-ia32
nixos/iso-image: fix 32bit UEFI boot
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 98712f0759a9..96fdb997b2c0 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -233,7 +233,7 @@ let " # Make our own efi program, we can't rely on "grub-install" since it seems to # probe for devices, even with --skip-fs-probe. - ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootx32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \ + ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \ $MODULES cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ |