From 678832df94e2e8ea238ec2b00843fd458b4a5c2d Mon Sep 17 00:00:00 2001 From: Matt Churchyard Date: Thu, 18 Mar 2021 13:17:57 +0000 Subject: [PATCH] Fix #403 add config option to allow passing bhyveload arguments (bhyveload_args) --- lib/vm-base | 2 +- lib/vm-guest | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/vm-base b/lib/vm-base index 295a92c..03a56b3 100644 --- a/lib/vm-base +++ b/lib/vm-base @@ -25,7 +25,7 @@ # POSSIBILITY OF SUCH DAMAGE. VERSION=1.5-devel -VERSION_INT=105015 +VERSION_INT=105016 VERSION_BSD=$(uname -K) PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin diff --git a/lib/vm-guest b/lib/vm-guest index 48782be..9cb83ae 100644 --- a/lib/vm-guest +++ b/lib/vm-guest @@ -49,7 +49,7 @@ # guest::load(){ local _iso="$1" - local _args _command _timeout _grub_opt _bsd_loader + local _args _command _timeout _grub_opt _bsd_loader _custom_args # require a boot disk if [ -z "${_bootdisk}" ]; then @@ -69,6 +69,10 @@ guest::load(){ _command="bhyveload" _args="${_args}${_args:+ }-m ${_memory} -e autoboot_delay=${_timeout}" + # look for custom bhyveload arguments + config::get "_custom_args" "bhyveload_args" + [ -n "${_custom_args}" ] && _args="${_args} ${_custom_args}" + # have a custom guest loader specified? config::get "_bsd_loader" "bhyveload_loader" [ -n "${_bsd_loader}" ] && _args="${_args} -l ${_bsd_loader}"