diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-02 12:10:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-02 12:10:33 +0200 |
| commit | b910b697f69cbe44ccc5e4ea56c30a97b47afc52 (patch) | |
| tree | eef88ee5efa19af8c43a69a0393c20ae2cb2ee5f /nixos/modules/installer/cd-dvd/iso-image.nix | |
| parent | 542a86037d57e4657919fb5130c7bf819d91d2c3 (diff) | |
| parent | e5bd74879517e6283113d82bec6309b09152f5cd (diff) | |
| download | nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.gz nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.bz2 nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.lz nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.xz nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.tar.zst nixlib-b910b697f69cbe44ccc5e4ea56c30a97b47afc52.zip | |
Merge master into staging
Diffstat (limited to 'nixos/modules/installer/cd-dvd/iso-image.nix')
| -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 74fce0d1721d..98712f0759a9 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/bootx64.efi -p /EFI/boot -O x86_64-efi \ + ${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 \ $MODULES cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ |