Mirrors/vm-bhyve
1
0
Fork 0
mirror of https://github.com/churchers/vm-bhyve.git synced 2025-12-11 09:20:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #355 - auto mode always setting on with 'auto' mode

Browse Source
This commit is contained in:
Matt Churchyard
2020-02-26 10:30:20 +00:00
parent 34670f3990
commit 3d4d6a3a6c
2 changed files with 4 additions and 3 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.
VERSION=1.5-devel
VERSION_INT=105010
VERSION_INT=105011
VERSION_BSD=$(uname -K)
PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin

5
lib/vm-run
View File

@@ -629,7 +629,7 @@ vm::bhyve_device_rand(){
# add frame buffer output
#
vm::bhyve_device_fbuf(){
local _port _listen _res _pass _vga
local _port _listen _res _pass _vga _wait
local _fbuf_conf
# only works in uefi mode
@@ -649,6 +649,7 @@ vm::bhyve_device_fbuf(){
config::get "_res" "graphics_res"
config::get "_vga" "graphics_vga"
config::get "_pass" "vnc_password"
config::get "_wait" "graphics_wait" "auto"
# check if graphics_wait is auto
# auto will count as yes so we need to unset it if we're not in an install.
@@ -672,7 +673,7 @@ vm::bhyve_device_fbuf(){
[ -n "${_res}" ] && _fbuf_conf="${_fbuf_conf},w=${_res%%x*},h=${_res##*x}"
[ -n "${_vga}" ] && _fbuf_conf="${_fbuf_conf},vga=${_vga}"
[ -n "${_pass}" ] && _fbuf_conf="${_fbuf_conf},password=${_pass}"
config::yesno "graphics_wait" "auto" && _fbuf_conf="${_fbuf_conf},wait"
util::yesno "${_wait}" && _fbuf_conf="${_fbuf_conf},wait"
# write vnc port to console data
echo "vnc=${_listen:-0.0.0.0}:${_port}" >> "${VM_DS_PATH}/${_name}/console"