Add support for sysutils/uefi-edk2-bhyve port

Rather than getting user to download firmware and place in a specific place,
just look in the above port's installation directory.

lib/vm-run

@@ -107,13 +107,18 @@ vm::run(){
 
         case "${_uefi}" in
             csm)
-                _bootrom="${vm_dir}/.config/BHYVE_UEFI_CSM.fd"
+                _bootrom="BHYVE_UEFI_CSM.fd"
                 ;&
             *)
-                [ -z "${_bootrom}" ] && _bootrom="${vm_dir}/.config/BHYVE_UEFI.fd"
+                [ -z "${_bootrom}" ] && _bootrom="BHYVE_UEFI.fd"
 
-                if [ ! -e "${_bootrom}" ]; then
-                    util::log "guest" "${_name}" "fatal; please download relevant uefi firmware to ${_bootrom}"
+                # look in sysutils/uefi-edk2-bhyve install location and our own .config dir
+                if [ -e "${vm_dir}/.config/${_bootrom}" ]; then
+                    _bootrom="${vm_dir}/.config/${_bootrom}"
+                elif [ -e "/usr/local/share/uefi-firmwares/${_bootrom}" ]; then
+                    _bootrom="/usr/local/share/uefi-firmwares/${_bootrom}"
+                else
+                    util::log "guest" "${_name}" "fatal; unable to locate relevant uefi firmware"
                     exit 15
                 fi
 

vm

@@ -24,8 +24,8 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=1.1
-VERSION_INT=101059
+VERSION=1.1-p1
+VERSION_INT=101060
 VERSION_BSD=$(uname -K)
 PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin
 

vm.8

@@ -1,4 +1,4 @@
-.Dd May 27, 2016
+.Dd July 8, 2016
 .Dt VM-BHYVE 8
 .Os
 .Sh NAME
@@ -256,7 +256,10 @@ support in
 As of April 2016, UEFI support should be available in FreeBSD 10.3+ and
 11-CURRENT.
 .Pp
-You will also need a copy of the UEFI firmware (see URL below), which needs to be placed in
+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 .
 .Pp
 As there is no VGA console in
@@ -285,7 +288,7 @@ and press
 to see the IP address that has been assigned. The default unattended installation files
 should make RDP available, using Administrator and Test123 as the default login details.
 .Pp
-The UEFI firmware (BHYVE_UEFI_20151002.fd), as well as instructions for creating an
+A pre-compiled copy of the UEFI firmware (BHYVE_UEFI_20160526.fd), as well as instructions for creating an
 unattended installation ISO can currently be obtained from
 .Pa https://people.freebsd.org/~grehan/bhyve_uefi/
 .\" ============ GLOBAL OPTIONS =============