Merge pull request araujobsd#3 from iXsystems/bhyveload-loader

allow specificiation of bhyveload loader file instead of using os file

lib/vm-guest

@@ -40,6 +40,7 @@
 # _memory: RAM
 # _guest: guest type
 # _bootdisk: full path to primary disk
+# _bhyveload_loader: full path to loader used by bhyveload
 #
 # I've written append wrong as it just needs to be something other than 'write',
 # and is much more readable when all the util::log* calls line up
@@ -68,6 +69,10 @@ guest::load(){
             else
                 _args="${_args} -d ${_bootdisk}"
             fi
+            if [ -n "${_bhyveload_loader}" ]  ; then
+                _args="${_args} -l ${_bhyveload_loader}"
+            fi
+
             ;;
         grub)
             _command=$(which grub-bhyve)

lib/vm-run

@@ -61,6 +61,7 @@ vm::run(){
     config::get "_debug" "debug" "no"
     config::get "_ignore_msr" "ignore_bad_msr" "no"
     config::get "_bhyve_options" "bhyve_options"
+    config::get "_bhyveload_loader" "bhyveload_loader"
 
     # generate a uuid if we don't have one already
     if [ -z "${_uuid}" ]; then