Mirrors/vm-bhyve
1
0
Fork 0
mirror of https://github.com/churchers/vm-bhyve.git synced 2025-12-24 02:59:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for persistent uefi vars with uefi_vars=yes config option

Browse Source
This commit is contained in:
Matt Churchyard
2022-02-25 09:40:20 +00:00
parent a4d64064c0
commit b977c60896
2 changed files with 56 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vm-base
View File

@@ -25,7 +25,7 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
VERSION=1.5-devel VERSION=1.5-devel
VERSION_INT=105016 VERSION_INT=105100
VERSION_BSD=$(uname -K) VERSION_BSD=$(uname -K)
PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin

85
lib/vm-run
View File

@@ -37,7 +37,7 @@ vm::run(){
local _cpu _memory _bootdisk _bootdisk_dev _guest _wiredmem local _cpu _memory _bootdisk _bootdisk_dev _guest _wiredmem
local _guest_support _uefi _uuid _debug _hostbridge _loader local _guest_support _uefi _uuid _debug _hostbridge _loader
local _opts _devices _slot _install_slot _func=0 _taplist _exit _passdev local _opts _devices _slot _install_slot _func=0 _taplist _exit _passdev
local _com _comports _comstring _logpath="/dev/null" _bootrom _run=1 local _com _comports _comstring _logpath="/dev/null" _run=1
local _bhyve_options _action local _bhyve_options _action
cmd::parse_args "$@" cmd::parse_args "$@"
@@ -116,35 +116,7 @@ vm::run(){
# if uefi, make sure we have bootrom, then update options for uefi support # if uefi, make sure we have bootrom, then update options for uefi support
if [ "${_loader%-*}" = "uefi" ]; then if [ "${_loader%-*}" = "uefi" ]; then
if [ ${VERSION_BSD} -lt 1002509 ]; then vm::uefi
util::log "guest" "${_name}" "fatal; uefi guests can only be run on FreeBSD 10.3 or newer"
exit 15
fi
case "${_loader}" in
uefi-devel)
_bootrom="/usr/local/share/uefi-firmware/BHYVE_UEFI_CODE-devel.fd"
;;
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"
;;
esac
if [ ! -e "${_bootrom}" ]; then
util::log "guest" "${_name}" "fatal; unable to locate firmware ${_bootrom}"
exit 15
fi
_opts="-Hwl bootrom,${_bootrom}"
_uefi="yes"
else
_uefi=""
fi fi
# add any custom bhyve options # add any custom bhyve options
@@ -298,6 +270,59 @@ vm::run(){
exit ${_exit} exit ${_exit}
} }
# creates options to use a uefi bootrom
#
# @modifies _opts _uefi
#
vm::uefi(){
local _bootrom
if [ ${VERSION_BSD} -lt 1002509 ]; then
util::log "guest" "${_name}" "fatal; uefi guests can only be run on FreeBSD 10.3 or newer"
exit 15
fi
case "${_loader}" in
uefi-devel)
_bootrom="/usr/local/share/uefi-firmware/BHYVE_UEFI_CODE-devel.fd"
;;
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"
;;
esac
if [ ! -e "${_bootrom}" ]; then
util::log "guest" "${_name}" "fatal; unable to locate firmware ${_bootrom}"
exit 15
fi
# should we store uefi vars?
if config::yesno "uefi_vars"; then
# do we already have a storage file for this guest?
if [ -e "${VM_DS_PATH}/${_name}/uefi-vars.fd" ]; then
:
elif [ -e "/usr/local/share/uefi-firmware/BHYVE_UEFI_VARS.fd" ]; then
# create a copy and use
cp "/usr/local/share/uefi-firmware/BHYVE_UEFI_VARS.fd" "${VM_DS_PATH}/${_name}/uefi-vars.fd"
else
util::log "guest" "${_name}" "fatal; unable to locate UEFI vars database or template"
exit 15
fi
_bootrom="${_bootrom},${VM_DS_PATH}/${_name}/uefi-vars.fd"
fi
_opts="-Hwl bootrom,${_bootrom}"
_uefi="yes"
}
# decide how to handle bhyve exit code # decide how to handle bhyve exit code
# #
# @param string _var variable to put action into # @param string _var variable to put action into