Cannot boot Qubes after switching to UEFI boot

I had some troubles booting, and then using, Fedora from the Live USB, but I figured out how to fix the bootloader. Here’s the steps in case anyone finds this useful:

  1. On the old PC, start a terminal in an AppVM
  2. git clone https://github.com/livecd-tools/livecd-tools.git
  3. sudo make install
  4. Download a Fedora ISO image
  5. Plug a spare USB key into a USB port - ALL DATA ON IT WILL BE ERASED BELOW
  6. sudo livecd-iso-to-disk --efi --format ext4 --nomac ~/Downloads/Fedora-Workstation-Live-x86_64-35-1.2.iso /dev/xvdi - adjust the name of your .iso file and USB device as appropriate
  7. Detach the USB device from the AppVM

Now, on the new PC:

  1. Ensure that UEFI boot is enabled and the graphics card is removed/disabled
  2. Remove the USB key from the old PC and plug it into the new PC
  3. Boot into the USB key
  4. Choose the option to Start Fedora-Workstation-Live (or whatever)
  5. Wait for it to boot and then choose “Try Fedora”
  6. Press Alt+F2
  7. Type gnome-terminal
  8. sudo bash
  9. Mount the Qubes installation as described in the documentation here. In my case I had to type crypsetup luksOpen /dev/nvme0n1p7 qubes and then mount /dev/qubes_dom0/root /mnt
  10. mount -t proc proc /mnt/proc
  11. mount -t sysfs sysfs /mnt/sys
  12. mount -t efivarfs efivarfs /mnt/sys/firmware/efi/efivars
  13. mount -o bind /dev /mnt/dev
  14. mount -t tmpfs tmpfs /mnt/run
  15. cat /mnt/etc/fstab
  16. Use blkid --uuid to find the /boot device whose UUID is given in the above file
  17. mount /dev/nvme0n1p6 /mnt/boot
  18. Use fdisk to find the ESP
  19. mount /dev/nvme0n1p1 /mnt/boot/EFI
  20. chroot /mnt
  21. grub2-install --efi-directory=/boot/efi. This will probably fail with an error about modinfo.sh not existing. If so, you’ll need to install the relevant package using dnf. This is a bit tricky because Qubes’ dnf config doesn’t work in a chroot.
  22. grub2-install --efi-directory=/boot/efi. This will probably fail with an error about efibootmgr not existing. If so, you’ll need to install the relevant package using dnf. This is a bit tricky because Qubes’ dnf config doesn’t work in a chroot.
  23. grub2-install --efi-directory=/boot/efi. This should finally work with no errors now!
  24. exit the chroot
  25. Reboot
  26. Select Qubes in the boot menu

However, now I am again faced with a blank screen, and I can’t progress any further. Any suggestions?