diff --git a/bin/vmm-lib.php b/bin/vmm-lib.php
index d77c801..8678da8 100644
--- a/bin/vmm-lib.php
+++ b/bin/vmm-lib.php
@@ -449,6 +449,11 @@ function vmm_selfcheck(): array
'vmm' => trim((string)@shell_exec('kldstat -q -n vmm && echo loaded || echo missing')),
'nmdm' => trim((string)@shell_exec('kldstat -q -n nmdm && echo loaded || echo missing')),
],
+ 'loader_conf' => [
+ 'file' => '/boot/loader.conf.local',
+ 'vmm' => (bool)preg_match('/^vmm_load=/m', (string)@file_get_contents('/boot/loader.conf.local')),
+ 'nmdm' => (bool)preg_match('/^nmdm_load=/m', (string)@file_get_contents('/boot/loader.conf.local')),
+ ],
];
$out['vm']['version'] = $vm['available'] ? vmm_vm_version() : [];
$out['datastores'] = $vm['available'] ? vmm_datastores() : [];
diff --git a/gui/ext/vmmngr/vmmngr.conf b/gui/ext/vmmngr/vmmngr.conf
index 841149d..75e7bd8 100644
--- a/gui/ext/vmmngr/vmmngr.conf
+++ b/gui/ext/vmmngr/vmmngr.conf
@@ -1,6 +1,6 @@
{
"appname": "VM Manager",
- "version": "0.3.0",
+ "version": "0.3.1",
"rootfolder": "/mnt/Daten/extensions/vmmngr",
"vm_source": "auto",
"bridges": ["ix0bridge"],
diff --git a/gui/vmmngr_config.php b/gui/vmmngr_config.php
index 4374e05..c853e58 100644
--- a/gui/vmmngr_config.php
+++ b/gui/vmmngr_config.php
@@ -33,6 +33,11 @@ vmm_nav('config'); ?>
vmm: =vmm_h($sc['kld']['vmm']);?> ·
nmdm: =vmm_h($sc['kld']['nmdm']);?>
+
| =gettext('Boot-time modules');?> |
+ =$sc['loader_conf']['file'];?>:
+ vmm_load==$sc['loader_conf']['vmm'] ? 'YES' : 'no';?> ·
+ nmdm_load==$sc['loader_conf']['nmdm'] ? 'YES' : 'no';?>
+ |
| =gettext('Virtual machines');?> | =$sc['vm_count'];?> =gettext('total');?>, =$sc['vm_running'];?> =gettext('running');?> |
| =gettext('RAM budget');?> | =vmm_human_bytes(vmm_ram_used());?> =gettext('in use');?> · =gettext('limit');?> =vmm_human_bytes($b['limit']);?> (=$b['pct'];?>% =gettext('of');?> =vmm_human_bytes($b['total']);?>) |
diff --git a/version.txt b/version.txt
index 0d91a54..9e11b32 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.3.0
+0.3.1
diff --git a/vmm-init b/vmm-init
index 529c521..2b32702 100644
--- a/vmm-init
+++ b/vmm-init
@@ -90,13 +90,45 @@ preflight() {
log "WARNING: neither /usr/local/sbin/vm nor a bundled vm-bhyve was found"
fi
- if ! kldstat -q -n vmm; then
- log "vmm.ko not loaded, trying kldload"
- kldload vmm 2>/dev/null || log "WARNING: could not load vmm.ko (needed for bhyve)"
+ ensure_kmods
+ ensure_loader_conf
+}
+
+# ---------------------------------------------------------------- kernel modules
+ensure_kmods() {
+ for mod in vmm nmdm; do
+ if kldstat -q -n "${mod}"; then
+ continue
+ fi
+ if kldload "${mod}" 2>/dev/null; then
+ log "kldload ${mod}: loaded"
+ elif kldstat -q -n "${mod}"; then
+ log "${mod} already present"
+ else
+ log "WARNING: could not load ${mod}.ko - bhyve will not work until it is loaded"
+ fi
+ done
+}
+
+ensure_loader_conf() {
+ conf="/boot/loader.conf.local"
+ changed=0
+ if [ ! -f "${conf}" ]; then
+ touch "${conf}" || { log "WARNING: cannot create ${conf}"; return 0; }
fi
- if ! kldstat -q -n nmdm; then
- log "nmdm.ko not loaded, trying kldload"
- kldload nmdm 2>/dev/null || log "WARNING: could not load nmdm.ko (needed for serial console)"
+ for entry in 'vmm_load="YES"' 'nmdm_load="YES"'; do
+ key=${entry%%=*}
+ if ! grep -q "^${key}=" "${conf}" 2>/dev/null; then
+ if [ "${changed}" -eq 0 ]; then
+ cp -p "${conf}" "${conf}.vmmngr.bak" 2>/dev/null || true
+ fi
+ printf '%s\n' "${entry}" >> "${conf}"
+ log "added ${entry} to ${conf}"
+ changed=1
+ fi
+ done
+ if [ "${changed}" -eq 1 ]; then
+ log "NOTE: ${conf} changed - modules are loaded at next boot; kldload covers the current session"
fi
}
@@ -235,6 +267,7 @@ cmd_postinit() {
# Runs at boot (rc postinit) on embedded systems. Must be quiet and fast,
# and must not touch the config when nothing is missing.
rotate_log
+ ensure_kmods
do_symlinks
}