Merge pull request #302 from tub5ta/patch-1

Allow for custom UEFI firmware

lib/vm-core

@@ -574,7 +574,7 @@ core::__start(){
 
     # check loader
     # uefi="" deprecated in 1.3, must be set via loader in 1.4
-    [ -z "${_loader}" -a -n "${_uefi}" ] && echo "  ! uefi setting is deprecated. please set loader=\"uefi\" or loader=\"uefi-csm\""
+    [ -z "${_loader}" -a -n "${_uefi}" ] && echo "  ! uefi setting is deprecated. please set loader=\"uefi\", loader=\"uefi-csm\" or loader=\"uefi-custom\""
 
     # check loader
     if [ "${_loader}" = "grub" ]; then

lib/vm-run

@@ -139,6 +139,9 @@ vm::run(){
             uefi-csm)
                 _bootrom="/usr/local/share/uefi-firmware/BHYVE_UEFI_CSM.fd"
                 ;;
+            uefi-custom)
+                _bootrom="${VM_DS_PATH}/.config/BHYVE_UEFI.fd"
+                ;;                
             *)
                 _bootrom="/usr/local/share/uefi-firmware/BHYVE_UEFI.fd"
                 ;;

vm.8

@@ -317,7 +317,8 @@ You will also need a copy of the UEFI firmware.
 This can either be installed using the
 .Pa sysutils/uefi-edk2-bhyve
 port, or you can manually download a copy (see URL below) to
-.Pa $vm_dir/.config/BHYVE_UEFI.fd .
+.Pa $vm_dir/.config/BHYVE_UEFI.fd and configure a guest to use it by setting
+.Sy loader="uefi-custom" .
 .Pp
 If you are running
 .Fx 10
@@ -1007,8 +1008,9 @@ The valid options are
 .Sy bhyveload ,
 .Sy grub ,
 .Sy uefi ,
+.Sy uefi-csm ,
 or
-.Sy uefi-csm .
+.Sy uefi-custom .
 .It bhyveload_loader
 This option allows a custom path to be used for the loader inside the guest.
 Passed to