mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 14:13:35 +00:00
1ea561212a
- updated project URL - add testVersion - add OVMF.fd and patch detection of paths - patch quickemu to ensure writeable efi_vars
29 lines
1.4 KiB
Diff
29 lines
1.4 KiB
Diff
diff --git a/quickemu b/quickemu
|
|
index 1a932ac..ab2f752 100755
|
|
--- a/quickemu
|
|
+++ b/quickemu
|
|
@@ -383,7 +383,10 @@ function vm_boot() {
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1929357#c5
|
|
case ${secureboot} in
|
|
on)
|
|
- if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then
|
|
+ if [[ ${ENV_EFI_CODE_SECURE} && ${ENV_EFI_CODE_SECURE-x} ]] && [[ ${ENV_EFI_VARS_SECURE} && ${ENV_EFI_VARS_SECURE-x} ]]; then
|
|
+ EFI_CODE="${ENV_EFI_CODE_SECURE}"
|
|
+ efi_vars "${ENV_EFI_VARS_SECURE}" "${EFI_VARS}"
|
|
+ elif [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then
|
|
EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.secboot.fd"
|
|
efi_vars "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}"
|
|
elif [ -e "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd" ]; then
|
|
@@ -402,7 +405,10 @@ function vm_boot() {
|
|
fi
|
|
;;
|
|
*)
|
|
- if [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ]; then
|
|
+ if [[ ${ENV_EFI_CODE} && ${ENV_EFI_CODE-x} ]] && [[ ${ENV_EFI_VARS} && ${ENV_EFI_VARS-x} ]]; then
|
|
+ EFI_CODE="${ENV_EFI_CODE}"
|
|
+ efi_vars "${ENV_EFI_VARS}" "${EFI_VARS}"
|
|
+ elif [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ]; then
|
|
EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.fd"
|
|
efi_vars "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}"
|
|
elif [ -e "/usr/share/edk2/ovmf/OVMF_CODE.fd" ]; then
|