--- installer/default.nix | 33 ++++++++++++++++++++------------- installer/grub.cfg.in | 10 ++++++++++ 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/installer/default.nix b/installer/default.nix index 39933d9..8c2a3d0 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -21,6 +21,22 @@ let ] ++ config.boot.kernelParams); }; + efi = runCommand "efi.img" { + nativeBuildInputs = [ grub libfaketime dosfstools mtools ]; + } '' + install -D ${grubCfg} files/grub/grub.cfg + cp -r ${grub}/lib/grub/${grub.grubTarget} files/grub/ + cp ${grub}/share/grub/unicode.pf2 files/grub/ + grub-mkimage -o grubx64.efi -p "(hd0,gpt1)/grub" -O ${grub.grubTarget} part_gpt fat + install -D grubx64.efi files/EFI/BOOT/BOOTX64.EFI + + img=$out + truncate -s 15M $img + faketime "1970-01-01 00:00:00" mkfs.vfat -i 0x2178694e -n EFI $img + (cd files; mcopy -psvm -i $img ./* ::) + fsck.vfat -vn $img + ''; + installer = runCommand "installer.img" { nativeBuildInputs = [ squashfs-tools-ng ]; } '' @@ -47,7 +63,7 @@ let ''); in -vmTools.runInLinuxVM (runCommand "spectrum-installer" { +runCommand "spectrum-installer" { nativeBuildInputs = [ dosfstools grub jq kmod util-linux systemdMinimal ]; } '' blockSize() { @@ -60,7 +76,7 @@ vmTools.runInLinuxVM (runCommand "spectrum-installer" { dd if="$3" of="$1" seek="$start" count="$size" conv=notrunc } - efiSize=40000 + efiSize="$(blockSize ${efi})" installerSize="$(blockSize ${installer})" eosimagesSize="$(blockSize ${eosimages})" @@ -72,16 +88,7 @@ vmTools.runInLinuxVM (runCommand "spectrum-installer" { size=$eosimagesSize, type=56a3bbc3-aefa-43d9-a64d-7b3fd59bbc4e EOF + fillPartition $out 0 ${efi} fillPartition $out 1 ${installer} fillPartition $out 2 ${eosimages} - - modprobe loop - loop="$(losetup -P --show -f $out)" - mkfs.vfat "$loop"p1 - mkdir /mnt - mount "$loop"p1 /mnt - grub-install --target ${grub.grubTarget} --removable \ - --boot-directory /mnt --efi-directory /mnt "$loop" - cp ${grubCfg} /mnt/grub/grub.cfg - umount /mnt -'') +'' diff --git a/installer/grub.cfg.in b/installer/grub.cfg.in index 46171ec..e4370f1 100644 --- a/installer/grub.cfg.in +++ b/installer/grub.cfg.in @@ -1,6 +1,16 @@ # SPDX-License-Identifier: EUPL-1.2 # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> +insmod efi_gop +insmod efi_uga +insmod font +loadfont /grub/unicode.pf2 +insmod gfxterm +set gfxmode=auto +set gfxpayload=keep +terminal_output gfxterm +set timeout=5 + menuentry "Try Spectrum" { loopback live (hd0,gpt3)/Spectrum-0.0-x86_64-generic.0.Live.img chainloader (live,gpt1)/efi/boot/bootx64.efi -- 2.34.0