oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Look for OVMF firmware in common locations. Close #74 Close #75

Browse source
This commit is contained in:
Martin Wimpress 2021-10-09 15:28:26 +01:00
parent d2d9bc1f1a
commit 0d5f393b70
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
1 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

43
quickemu
View file

@ -143,6 +143,8 @@ function vm_boot() {
local BALLOON="-device virtio-balloon" local BALLOON="-device virtio-balloon"
local CPU="" local CPU=""
local DISK_USED="" local DISK_USED=""
local EFI_CODE=""
local EFI_VARS=""
local GUEST_CPU_CORES="" local GUEST_CPU_CORES=""
local GUEST_CPU_LOGICAL_CORES="" local GUEST_CPU_LOGICAL_CORES=""
local GUEST_CPU_THREADS="" local GUEST_CPU_THREADS=""
@ -175,8 +177,8 @@ function vm_boot() {
boot="efi" boot="efi"
echo " - BOOT: EFI (${guest_os})" echo " - BOOT: EFI (${guest_os})"
if [ -e "${VMDIR}/OVMF_CODE.fd" ] && [ -e "${VMDIR}/OVMF_VARS-1024x768.fd" ]; then if [ -e "${VMDIR}/OVMF_CODE.fd" ] && [ -e "${VMDIR}/OVMF_VARS-1024x768.fd" ]; then
local EFI_CODE="${VMDIR}/OVMF_CODE.fd" EFI_CODE="${VMDIR}/OVMF_CODE.fd"
local EFI_VARS="${VMDIR}/OVMF_VARS-1024x768.fd" EFI_VARS="${VMDIR}/OVMF_VARS-1024x768.fd"
else else
MAC_MISSING="Firmware" MAC_MISSING="Firmware"
fi fi
@ -196,15 +198,36 @@ function vm_boot() {
exit 1 exit 1
fi fi
elif [[ "${boot}" == *"efi"* ]]; then elif [[ "${boot}" == *"efi"* ]]; then
if [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ]; then EFI_VARS="${VMDIR}/OVMF_VARS.fd"
# Preserve backward compatibility
if [ -e "${VMDIR}/${VMNAME}-vars.fd" ]; then
mv "${VMDIR}/${VMNAME}-vars.fd" "${EFI_VARS}"
elif [ -e "${VMDIR}/OVMF_VARS_4M.fd" ]; then
mv "${VMDIR}/OVMF_VARS_4M.fd" "${EFI_VARS}"
fi
if [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ] ||
[ -e "/usr/share/OVMF/x64/OVMF_CODE.fd" ] ||
[ -e "/usr/share/OVMF/OVMF_CODE.fd" ]; then
echo " - BOOT: EFI (${guest_os})" echo " - BOOT: EFI (${guest_os})"
local EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.fd"
local EFI_VARS="${VMDIR}/OVMF_VARS_4M.fd" if [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ]; then
if [ -e "${VMDIR}/${VMNAME}-vars.fd" ]; then EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.fd"
# Preserve backward compatibility elif [ -e "/usr/share/OVMF/x64/OVMF_CODE.fd" ]; then
mv "${VMDIR}/${VMNAME}-vars.fd" "${EFI_VARS}" EFI_CODE="/usr/share/OVMF/x64/OVMF_CODE.fd"
elif [ ! -e "${EFI_VARS}" ]; then elif [ -e "/usr/share/OVMF/OVMF_CODE.fd" ]; then
cp "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}" EFI_CODE="/usr/share/OVMF/OVMF_CODE.fd"
fi
if [ ! -e "${EFI_VARS}" ]; then
if [ -e "/usr/share/OVMF/OVMF_VARS_4M.fd" ]; then
cp "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}"
elif [ -e "/usr/share/OVMF/x64/OVMF_VARS.fd" ]; then
cp "/usr/share/OVMF/x64/OVMF_VARS.fd" "${EFI_VARS}"
elif [ -e "/usr/share/OVMF/OVMF_VARS.fd" ]; then
cp "/usr/share/OVMF/OVMF_VARS.fd" "${EFI_VARS}"
fi
fi fi
else else
boot="legacy" boot="legacy"