Skip to content

vm-util: fix vmm module detection #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wrench56 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

vm-util: fix vmm module detection #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions lib/vm-util
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,21 @@ util::setup(){

# load a kernel module
#
# @param string _mod the module name
# @param string _mod the module name or filename
# @param string _kind lookup mode, "mod" for module name or "file" for filename
#
util::load_module(){
local _mod="$1"
kldstat -qm ${_mod} >/dev/null 2>&1
local _kind="${2:-mod}"

if [ "${_kind}" = "file" ]; then
kldstat -qn ${_mod} >/dev/null 2>&1
else
kldstat -qm ${_mod} >/dev/null 2>&1
fi
if [ $? -ne 0 ]; then
kldload ${_mod} >/dev/null 2>&1
[ $? -eq 0 ] || util::err "unable to load ${_mod}.ko!"
[ $? -eq 0 ] || util::err "unable to load ${_mod}!"
fi
}

Expand All @@ -54,7 +61,7 @@ util::check_bhyve_support(){
# we do this here to make sure the sysctls exist, and before disable_host_checks
# as we want this loaded anyway. FreeBSD version check removed as the
# module won't exist on systems too old for bhyve
util::load_module "vmm"
util::load_module "vmm.ko" "file"

# don't check if user wants to bypass host checks
util::yesno "$vm_disable_host_checks" && return 0
Expand Down