diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c4f79e..2d6a97b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the VM Manager extension. +## 0.10.2 +- Create wizard: driver ISO (virtio-win) as second CD device, separate download row, + hint when no virtio image is present. + ## 0.10.1 - Create wizard: pick an ISO from `.iso`, download one inline by URL, optional "start right after create" (ISO is attached as CD before boot). diff --git a/README.md b/README.md index d610504..868eaa8 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Status: **0.10.1** – feature-complete for daily use on a single node. |---|---| | Dashboard | all guests with state, loader, vCPU, RAM, datastore, autostart; start/stop/restart inline | | VM actions | start, stop, restart, reset, power-off, destroy (typed name required, ZFS holds released first) | -| Create wizard | template, datastore, vCPU/RAM/disk, switch, optional boot ISO, optional start, optional cloud-init image | +| Create wizard | template, datastore, vCPU/RAM/disk, switch, optional boot ISO, optional virtio-win driver ISO, optional start, optional cloud-init image | | Images | ISO/IMG inventory, HTTP(S) downloads as jobs, delete with typed confirmation, virtio-win preset | | Templates | list, edit, duplicate, delete, create from skeleton | | Datastores | add/remove vm-bhyve datastores, usage column, default cannot be removed | diff --git a/bin/vmm-jobd b/bin/vmm-jobd index ff24710..97f3481 100755 --- a/bin/vmm-jobd +++ b/bin/vmm-jobd @@ -192,12 +192,20 @@ if ($verb === 'create' && !empty($job['switch'])) { // optional: attach the chosen ISO and boot right away if ($verb === 'create' && $rc === 0 && empty($timedOut)) { - if (!empty($job['iso'])) { - $att = vmm_iso_attach($name, [(string)$job['iso']]); + $isos = []; + foreach (['iso', 'driver_iso'] as $key) { + if (!empty($job[$key])) { + $isos[] = (string)$job[$key]; + } + } + if ($isos !== []) { + $att = vmm_iso_attach($name, $isos); if (isset($att['error'])) { joblog($log, 'iso attach failed: ' . $att['error']); } else { - joblog($log, 'iso attached: ' . basename((string)$job['iso'])); + foreach ($isos as $isoPath) { + joblog($log, 'iso attached: ' . basename($isoPath)); + } } } if (!empty($job['autostart']) && !empty($job['iso'])) { diff --git a/gui/ext/vmmngr/vmmngr.conf b/gui/ext/vmmngr/vmmngr.conf index 8da579e..82d960b 100644 --- a/gui/ext/vmmngr/vmmngr.conf +++ b/gui/ext/vmmngr/vmmngr.conf @@ -1,6 +1,6 @@ { "appname": "VM Manager", - "version": "0.10.1", + "version": "0.10.2", "rootfolder": "/mnt/Daten/extensions/vmmngr", "vm_source": "auto", "bridges": ["ix0bridge"], diff --git a/gui/vmmngr_create.php b/gui/vmmngr_create.php index d981f14..e1b1c36 100644 --- a/gui/vmmngr_create.php +++ b/gui/vmmngr_create.php @@ -36,6 +36,7 @@ if ($post) { $img = (string)($_POST['image'] ?? ''); $switch = trim((string)($_POST['switch'] ?? '')); $iso = vmm_safe_basename((string)($_POST['iso'] ?? '')); + $driverIso = vmm_safe_basename((string)($_POST['driver_iso'] ?? '')); $autostart = isset($_POST['autostart']); if (!vmm_valid_name($name)) { @@ -76,6 +77,9 @@ if ($post) { if ($iso !== '' && str_ends_with(strtolower($iso), '.iso')) { $meta['iso'] = vmm_data_dir('.iso') . '/' . $iso; } + if ($driverIso !== '' && str_ends_with(strtolower($driverIso), '.iso')) { + $meta['driver_iso'] = vmm_data_dir('.iso') . '/' . $driverIso; + } if ($autostart) { $meta['autostart'] = '1'; } @@ -184,11 +188,39 @@ vmm_nav('create'); -
- - - -
+ + + + + + + + + + + + + + + +
diff --git a/version.txt b/version.txt index 5712157..5eef0f1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.10.1 +0.10.2