0.3.3: allow argv jobs (create), fix zero timeout, longer stop wait, template name without .conf
This commit is contained in:
1 parent
5bdd3c82c6
commit
e989df97a5
5 files changed
+24
-7
No files matched your search
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"appname": "VM Manager",
|
||||
"version": "0.3.2",
|
||||
"version": "0.3.3",
|
||||
"rootfolder": "/mnt/Daten/extensions/vmmngr",
|
||||
"vm_source": "auto",
|
||||
"bridges": ["ix0bridge"],
|
||||
|
||||
@@ -48,7 +48,9 @@ if ($post) {
|
||||
vmm_human_bytes($budget['limit'])
|
||||
);
|
||||
} else {
|
||||
$argv = ['create', '-t', $tpl, '-d', $ds, '-s', strtoupper($size), '-m', strtoupper($mem), '-c', $cpu];
|
||||
// vm-bhyve expects the template name without the .conf suffix
|
||||
$tplName = preg_replace('/\.conf$/', '', $tpl);
|
||||
$argv = ['create', '-t', $tplName, '-d', $ds, '-s', strtoupper($size), '-m', strtoupper($mem), '-c', $cpu];
|
||||
if ($cloud) {
|
||||
$argv[] = '-C';
|
||||
$argv[] = '-i';
|
||||
|
||||
@@ -28,6 +28,12 @@ if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && isset($
|
||||
exit;
|
||||
}
|
||||
|
||||
if (vmm_vm_state($name) === 'absent') {
|
||||
$_SESSION['vmmngr_error'] = sprintf(gettext('Virtual machine %s does not exist (yet).'), $name);
|
||||
header('Location: vmmngr.php');
|
||||
exit;
|
||||
}
|
||||
|
||||
$info = vmm_info($name);
|
||||
$pgtitle = [gettext('Extensions'), gettext('VM Manager'), $name];
|
||||
$jobs = vmm_job_list(10, $name);
|
||||
|
||||
Reference in new issue
Block a user