mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-05 09:30:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'limetech/6.4-wip' into 6.4-wip

Browse Source
This commit is contained in:
bergware
2018-03-07 13:40:26 +01:00
parent fca45d6cd9 250ab8795c
commit c9888e8264
6 changed files with 242 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.vm.manager/VMedit.php
+5 -3
View File
@@ -24,7 +24,8 @@ $arrLoad = [
'name' => '',
'icon' => $arrAllTemplates[$strSelectedTemplate]['icon'],
'autostart' => false,
'form' => $arrAllTemplates[$strSelectedTemplate]['form']
'form' => $arrAllTemplates[$strSelectedTemplate]['form'],
'state' => 'shutoff'
];
$strIconURL = '/plugins/dynamix.vm.manager/templates/images/'.$arrLoad['icon'];
@@ -43,7 +44,8 @@ if (!empty($_GET['uuid'])) {
'name' => $lv->domain_get_name($res),
'icon' => basename($strIconURL),
'autostart' => $lv->domain_get_autostart($res),
'form' => $arrAllTemplates[$strSelectedTemplate]['form']
'form' => $arrAllTemplates[$strSelectedTemplate]['form'],
'state' => $lv->domain_get_state($res)
];
if (empty($_GET['template'])) {
@@ -381,7 +383,7 @@ $(function() {
var category = $(this).data('category');
updatePrefixLabels(category);
bindSectionEvents(category);
<?if ($arrLoad['state'] == 'shutoff'):?> bindSectionEvents(category); <?endif;?>
});
$("#vmform input[data-pickroot]").fileTreeAttach();
plugins/dynamix.vm.manager/classes/libvirt.php
+1 -1
View File
@@ -1656,7 +1656,7 @@
$tmp = $this->domain_get_info( $domain, $name );
if (!$tmp)
return $this->_set_last_error();
$ret = ( ($tmp['state'] == VIR_DOMAIN_RUNNING) || ($tmp['state'] == VIR_DOMAIN_BLOCKED) );
$ret = ( ($tmp['state'] == VIR_DOMAIN_RUNNING) || ($tmp['state'] == VIR_DOMAIN_BLOCKED) || ($tmp['state'] == 7 /*VIR_DOMAIN_PMSUSPENDED*/) );
unset($tmp);
return $ret;
}
plugins/dynamix.vm.manager/javascript/vmmanager.js
+2 -1
View File
@@ -24,7 +24,7 @@ function addVMContext(name, uuid, template, state, vncurl, log){
}
if (state == "running") {
opts.push({text:"Stop", icon:"fa-stop", action:function(e) {
e.preventDefault();
e.preventDefault();
ajaxVMDispatch({action:"domain-stop", uuid:uuid}, "loadlist");
}});
opts.push({text:"Pause", icon:"fa-pause", action:function(e) {
@@ -86,6 +86,7 @@ function addVMContext(name, uuid, template, state, vncurl, log){
}});
}
} else {
opts.push({text:"Edit", icon:"fa-pencil", href:path+'/UpdateVM?uuid='+uuid});
opts.push({text:"View XML", icon:"fa-code", href:path+'/UpdateVM?template=Custom&amp;uuid='+uuid});
}
context.attach('#vm-'+uuid, opts);
plugins/dynamix.vm.manager/templates/Custom.form.php
+78 -13
View File
@@ -100,6 +100,10 @@
$arrConfigDefaults = array_replace_recursive($arrConfigDefaults, $arrAllTemplates[$strSelectedTemplate]['overrides']);
}
if (array_key_exists('updatevm', $_POST) && !empty($_POST['domain']['uuid'])) {
$_GET['uuid'] = $_POST['domain']['uuid'];
}
// If we are editing a existing VM load it's existing configuration details
$arrExistingConfig = (!empty($_GET['uuid']) ? domain_to_config($_GET['uuid']) : []);
@@ -138,10 +142,66 @@
}
if (array_key_exists('updatevm', $_POST)) {
$dom = $lv->domain_get_domain_by_uuid($_POST['domain']['uuid']);
if ($boolRunning) {
$arrErrors = [];
$arrExistingConfig = domain_to_config($_POST['domain']['uuid']);
$arrNewUSBIDs = $_POST['usb'];
// hot-attach any new usb devices
foreach ($arrNewUSBIDs as $strNewUSBID) {
foreach ($arrExistingConfig['usb'] as $arrExistingUSB) {
if ($strNewUSBID == $arrExistingUSB['id']) {
continue 2;
}
}
list($strVendor, $strProduct) = explode(':', $strNewUSBID);
// hot-attach usb
file_put_contents('/tmp/hotattach.tmp', "<hostdev mode='subsystem' type='usb'>
<source startupPolicy='optional'>
<vendor id='0x".$strVendor."'/>
<product id='0x".$strProduct."'/>
</source>
</hostdev>");
exec("virsh attach-device " . escapeshellarg($_POST['domain']['uuid']) . " /tmp/hotattach.tmp --live 2>&1", $arrOutput, $intReturnCode);
if ($intReturnCode != 0) {
$arrErrors[] = implode(' ', $arrOutput);
}
}
// hot-detach any old usb devices
foreach ($arrExistingConfig['usb'] as $arrExistingUSB) {
if (!in_array($arrExistingUSB['id'], $arrNewUSBIDs)) {
list($strVendor, $strProduct) = explode(':', $arrExistingUSB['id']);
file_put_contents('/tmp/hotdetach.tmp', "<hostdev mode='subsystem' type='usb'>
<source startupPolicy='optional'>
<vendor id='0x".$strVendor."'/>
<product id='0x".$strProduct."'/>
</source>
</hostdev>");
exec("virsh detach-device " . escapeshellarg($_POST['domain']['uuid']) . " /tmp/hotdetach.tmp --live 2>&1", $arrOutput, $intReturnCode);
if ($intReturnCode != 0) {
$arrErrors[] = implode(' ', $arrOutput);
}
}
}
if (empty($arrErrors)) {
$arrResponse = ['success' => true];
} else {
$arrResponse = ['error' => implode(', ', $arrErrors)];
}
echo json_encode($arrResponse);
exit;
}
// Backup xml for existing domain in ram
$strOldXML = '';
$boolOldAutoStart = false;
$dom = $lv->domain_get_domain_by_uuid($_POST['domain']['uuid']);
if ($dom) {
$strOldXML = $lv->domain_get_xml($dom);
$boolOldAutoStart = $lv->domain_get_autostart($dom);
@@ -1025,20 +1085,16 @@
<tr>
<td></td>
<td>
<? if (!$boolRunning) { ?>
<? if (!$boolNew) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
<label for="domain_start"><input type="checkbox" name="domain[startnow]" id="domain_start" value="1" checked="checked"/> Start VM after creation</label>
<br>
<input type="hidden" name="createvm" value="1" />
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
<? if (!$boolNew) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
<input type="button" value="Done" id="btnCancel" />
<label for="domain_start"><input type="checkbox" name="domain[startnow]" id="domain_start" value="1" checked="checked"/> Start VM after creation</label>
<br>
<input type="hidden" name="createvm" value="1" />
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
</td>
</tr>
</table>
@@ -1259,6 +1315,10 @@ $(function() {
$("#vmform .domain_vcpu").change(); // restore the cpu checkbox disabled states
<? if (!empty($arrConfig['domain']['state'])) echo '$(\'#vmform #domain_ovmf\').prop(\'disabled\', true); // restore bios disabled state' . "\n"; ?>
$button.val($button.attr('readyvalue'));
<?if ($boolRunning):?>
$("#vmform").find('input[type!="button"],select,.mac_generate').prop('disabled', true);
$("#vmform").find('input[name^="usb"]').prop('disabled', false);
<?endif?>
}
}, "json");
});
@@ -1304,5 +1364,10 @@ $(function() {
}
regenerateDiskPreview();
<?if ($boolRunning):?>
$("#vmform").find('input[type!="button"],select,.mac_generate').prop('disabled', true);
$("#vmform").find('input[name^="usb"]').prop('disabled', false);
<?endif?>
});
</script>
plugins/dynamix.vm.manager/templates/LibreELEC.form.php
+78 -13
View File
@@ -310,6 +310,10 @@
$arrConfigDefaults = array_replace_recursive($arrConfigDefaults, $arrAllTemplates[$strSelectedTemplate]['overrides']);
}
if (array_key_exists('updatevm', $_POST) && !empty($_POST['domain']['uuid'])) {
$_GET['uuid'] = $_POST['domain']['uuid'];
}
// If we are editing a existing VM load it's existing configuration details
$arrExistingConfig = (!empty($_GET['uuid']) ? domain_to_config($_GET['uuid']) : []);
@@ -341,6 +345,63 @@
}
if (array_key_exists('updatevm', $_POST)) {
$dom = $lv->domain_get_domain_by_uuid($_POST['domain']['uuid']);
if ($boolRunning) {
$arrErrors = [];
$arrExistingConfig = domain_to_config($_POST['domain']['uuid']);
$arrNewUSBIDs = $_POST['usb'];
// hot-attach any new usb devices
foreach ($arrNewUSBIDs as $strNewUSBID) {
foreach ($arrExistingConfig['usb'] as $arrExistingUSB) {
if ($strNewUSBID == $arrExistingUSB['id']) {
continue 2;
}
}
list($strVendor, $strProduct) = explode(':', $strNewUSBID);
// hot-attach usb
file_put_contents('/tmp/hotattach.tmp', "<hostdev mode='subsystem' type='usb'>
<source startupPolicy='optional'>
<vendor id='0x".$strVendor."'/>
<product id='0x".$strProduct."'/>
</source>
</hostdev>");
exec("virsh attach-device " . escapeshellarg($_POST['domain']['uuid']) . " /tmp/hotattach.tmp --live 2>&1", $arrOutput, $intReturnCode);
if ($intReturnCode != 0) {
$arrErrors[] = implode(' ', $arrOutput);
}
}
// hot-detach any old usb devices
foreach ($arrExistingConfig['usb'] as $arrExistingUSB) {
if (!in_array($arrExistingUSB['id'], $arrNewUSBIDs)) {
list($strVendor, $strProduct) = explode(':', $arrExistingUSB['id']);
file_put_contents('/tmp/hotdetach.tmp', "<hostdev mode='subsystem' type='usb'>
<source startupPolicy='optional'>
<vendor id='0x".$strVendor."'/>
<product id='0x".$strProduct."'/>
</source>
</hostdev>");
exec("virsh detach-device " . escapeshellarg($_POST['domain']['uuid']) . " /tmp/hotdetach.tmp --live 2>&1", $arrOutput, $intReturnCode);
if ($intReturnCode != 0) {
$arrErrors[] = implode(' ', $arrOutput);
}
}
}
if (empty($arrErrors)) {
$arrResponse = ['success' => true];
} else {
$arrResponse = ['error' => implode(', ', $arrErrors)];
}
echo json_encode($arrResponse);
exit;
}
if (!empty($_POST['shares'][0]['source'])) {
@mkdir($_POST['shares'][0]['source'], 0777, true);
}
@@ -348,7 +409,6 @@
// Backup xml for existing domain in ram
$strOldXML = '';
$boolOldAutoStart = false;
$dom = $lv->domain_get_domain_by_uuid($_POST['domain']['uuid']);
if ($dom) {
$strOldXML = $lv->domain_get_xml($dom);
$boolOldAutoStart = $lv->domain_get_autostart($dom);
@@ -913,20 +973,16 @@
<tr>
<td></td>
<td>
<? if (!$boolRunning) { ?>
<? if (!$boolNew) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
<label for="domain_start"><input type="checkbox" name="domain[startnow]" id="domain_start" value="1" checked="checked"/> Start VM after creation</label>
<br>
<input type="hidden" name="createvm" value="1" />
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
<? if (!$boolNew) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
<input type="button" value="Done" id="btnCancel" />
<label for="domain_start"><input type="checkbox" name="domain[startnow]" id="domain_start" value="1" checked="checked"/> Start VM after creation</label>
<br>
<input type="hidden" name="createvm" value="1" />
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
</td>
</tr>
</table>
@@ -1001,6 +1057,10 @@ $(function() {
$form.find('input').prop('disabled', false);
$("#vmform .domain_vcpu").change(); // restore the cpu checkbox disabled states
$button.val($button.attr('readyvalue'));
<?if ($boolRunning):?>
$("#vmform").find('input[type!="button"],select,.mac_generate').prop('disabled', true);
$("#vmform").find('input[name^="usb"]').prop('disabled', false);
<?endif?>
}
}, "json");
});
@@ -1103,5 +1163,10 @@ $(function() {
$("#vmform #libreelec_image").html($selected.attr('localpath'));
}
}).change(); // Fire now too!
<?if ($boolRunning):?>
$("#vmform").find('input[type!="button"],select,.mac_generate').prop('disabled', true);
$("#vmform").find('input[name^="usb"]').prop('disabled', false);
<?endif?>
});
</script>
plugins/dynamix.vm.manager/templates/OpenELEC.form.php
+78 -13
View File
@@ -310,6 +310,10 @@
$arrConfigDefaults = array_replace_recursive($arrConfigDefaults, $arrAllTemplates[$strSelectedTemplate]['overrides']);
}
if (array_key_exists('updatevm', $_POST) && !empty($_POST['domain']['uuid'])) {
$_GET['uuid'] = $_POST['domain']['uuid'];
}
// If we are editing a existing VM load it's existing configuration details
$arrExistingConfig = (!empty($_GET['uuid']) ? domain_to_config($_GET['uuid']) : []);
@@ -341,6 +345,63 @@
}
if (array_key_exists('updatevm', $_POST)) {
$dom = $lv->domain_get_domain_by_uuid($_POST['domain']['uuid']);
if ($boolRunning) {
$arrErrors = [];
$arrExistingConfig = domain_to_config($_POST['domain']['uuid']);
$arrNewUSBIDs = $_POST['usb'];
// hot-attach any new usb devices
foreach ($arrNewUSBIDs as $strNewUSBID) {
foreach ($arrExistingConfig['usb'] as $arrExistingUSB) {
if ($strNewUSBID == $arrExistingUSB['id']) {
continue 2;
}
}
list($strVendor, $strProduct) = explode(':', $strNewUSBID);
// hot-attach usb
file_put_contents('/tmp/hotattach.tmp', "<hostdev mode='subsystem' type='usb'>
<source startupPolicy='optional'>
<vendor id='0x".$strVendor."'/>
<product id='0x".$strProduct."'/>
</source>
</hostdev>");
exec("virsh attach-device " . escapeshellarg($_POST['domain']['uuid']) . " /tmp/hotattach.tmp --live 2>&1", $arrOutput, $intReturnCode);
if ($intReturnCode != 0) {
$arrErrors[] = implode(' ', $arrOutput);
}
}
// hot-detach any old usb devices
foreach ($arrExistingConfig['usb'] as $arrExistingUSB) {
if (!in_array($arrExistingUSB['id'], $arrNewUSBIDs)) {
list($strVendor, $strProduct) = explode(':', $arrExistingUSB['id']);
file_put_contents('/tmp/hotdetach.tmp', "<hostdev mode='subsystem' type='usb'>
<source startupPolicy='optional'>
<vendor id='0x".$strVendor."'/>
<product id='0x".$strProduct."'/>
</source>
</hostdev>");
exec("virsh detach-device " . escapeshellarg($_POST['domain']['uuid']) . " /tmp/hotdetach.tmp --live 2>&1", $arrOutput, $intReturnCode);
if ($intReturnCode != 0) {
$arrErrors[] = implode(' ', $arrOutput);
}
}
}
if (empty($arrErrors)) {
$arrResponse = ['success' => true];
} else {
$arrResponse = ['error' => implode(', ', $arrErrors)];
}
echo json_encode($arrResponse);
exit;
}
if (!empty($_POST['shares'][0]['source'])) {
@mkdir($_POST['shares'][0]['source'], 0777, true);
}
@@ -348,7 +409,6 @@
// Backup xml for existing domain in ram
$strOldXML = '';
$boolOldAutoStart = false;
$dom = $lv->domain_get_domain_by_uuid($_POST['domain']['uuid']);
if ($dom) {
$strOldXML = $lv->domain_get_xml($dom);
$boolOldAutoStart = $lv->domain_get_autostart($dom);
@@ -916,20 +976,16 @@
<tr>
<td></td>
<td>
<? if (!$boolRunning) { ?>
<? if (!$boolNew) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
<label for="domain_start"><input type="checkbox" name="domain[startnow]" id="domain_start" value="1" checked="checked"/> Start VM after creation</label>
<br>
<input type="hidden" name="createvm" value="1" />
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
<? if (!$boolNew) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
<input type="button" value="Done" id="btnCancel" />
<label for="domain_start"><input type="checkbox" name="domain[startnow]" id="domain_start" value="1" checked="checked"/> Start VM after creation</label>
<br>
<input type="hidden" name="createvm" value="1" />
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
</td>
</tr>
</table>
@@ -1004,6 +1060,10 @@ $(function() {
$form.find('input').prop('disabled', false);
$("#vmform .domain_vcpu").change(); // restore the cpu checkbox disabled states
$button.val($button.attr('readyvalue'));
<?if ($boolRunning):?>
$("#vmform").find('input[type!="button"],select,.mac_generate').prop('disabled', true);
$("#vmform").find('input[name^="usb"]').prop('disabled', false);
<?endif?>
}
}, "json");
});
@@ -1106,5 +1166,10 @@ $(function() {
$("#vmform #openelec_image").html($selected.attr('localpath'));
}
}).change(); // Fire now too!
<?if ($boolRunning):?>
$("#vmform").find('input[type!="button"],select,.mac_generate').prop('disabled', true);
$("#vmform").find('input[name^="usb"]').prop('disabled', false);
<?endif?>
});
</script>