Qubes 4.1: efibootmgr usage

As my stupid motherboard BIOS always looses the UEFI boot entry of Qubes once I disconnect my SSD with Qubes on it, I frequently have to run efibootmgr to fix it. BTW: Is that behavior a BIOS “bug” or is that “by design”?

I knew how to do that with 4.0 based on Qubes UEFI troubleshooting guide

efibootmgr -v -c -u -L Qubes -l /EFI/qubes/xen.efi -d /dev/sda -p 1 “placeholder /mapbs /noexitboot”

With 4.1 however, this no longer works. I always end up skipping the GRUB boot loader part and having to enter the password right away, so I cannot change the kernel or adjust kernel parameters.

Could someone please point me to the correct efibootmgr command to use now - and maybe update/enhance the UEFI guide as well for 4.1? My guess is that /EFI/qubes/xen.efi has to point elsewhere?

If your device is /dev/sda and efi partition is 1 then :
efibootmgr -v -c -u -L MichaelA -l /EFI/qubes/grubx64.efi -d /dev/sda -p 1

If you use qubes os as external device, folow this (I assume that your device is /dev/sda and efi partition is 1) :

cp /boot/efi/EFI/qubes/* /boot/efi/EFI/BOOT
mv /boot/efi/EFI/BOOT/grubx64.efi /boot/efi/EFI/BOOT/bootx64.efi
mv /boot/efi/EFI/BOOT/grub.cfg /boot/efi/EFI/BOOT/boox64.cfg
efibootmgr -v -c -u -L MichaelB -l /EFI/BOOT/bootx.64efi -d /dev/sda -p 1