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

Fix usb updates.

Browse Source
This commit is contained in:
SimonFair
2023-07-02 21:37:11 +01:00
parent a08452c59e
commit 2b3990922d
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+2 -3
View File
@@ -468,9 +468,8 @@
if (isset($usbopt[$v]) && !$vmclone ) {
if (strpos($usbopt[$v], "#remove") == false) $startupPolicy = 'startupPolicy="optional"' ; else $startupPolicy = '' ;
}
if ($vmclone ) {
if (isset($v["startupPolicy"]) && $vmclone ) {
if ($v["startupPolicy"] == "optional" ) $startupPolicy = 'startupPolicy="optional"' ; else $startupPolicy = '' ;
#$startupPolicy = 'startupPolicy="optional"' ;
}
$usbstr .= "<hostdev mode='subsystem' type='usb'>
@@ -481,7 +480,7 @@
if (!empty($usbboot[$v]) && !$vmclone ) {
$usbstr .= "<boot order='".$usbboot[$v]."'/>" ;
}
if ($vmclone ) {
if (isset($v["usbboot"]) && $vmclone ) {
if ($v["usbboot"] != NULL) $usbstr .= "<boot order='".$v["usbboot"]."'/>" ;
}
$usbstr .= "</hostdev>";
emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+2 -2
View File
@@ -1483,7 +1483,7 @@ private static $encoding = 'UTF-8';
*/
$uuid = $lv->domain_get_uuid($clone) ;
write("addLog\0".htmlspecialchars(_("Checking if clone exists")));
if ($uuid) { $arrResponse = ['error' => _("Clone VM name already inuse")]; return $arrResponse ;}
if ($uuid) { $arrResponse = ['error' => _("Clone VM name already inuse")]; return false ;}
#VM must be shutdown.
$res = $lv->get_domain_by_name($vm);
$dom = $lv->domain_get_info($res);
@@ -1530,7 +1530,7 @@ private static $encoding = 'UTF-8';
if ($usb["checked"] == "checked") continue ;
unset($usbs[$i]) ;
}
$config["domain"]["usb"] = $usbs ;
$config["usb"] = $usbs ;
$files_exist = false ;
$files_clone = array() ;
emhttp/plugins/dynamix/include/DefaultPageLayout.php
+2 -2
View File
@@ -971,12 +971,12 @@ nchan_vmaction.on('message', function(data) {
rows = document.getElementsByClassName('logLine');
if (rows.length) {
var row = rows[rows.length-1];
row.innerHTML += '<span id="'+data[1]+'">'+data[1]+': <span class="content">'+data[2]+'</span><span class="progress-'+data[1]+'"></span>.</span><br>';
row.innerHTML += '<span id="'+data[1]+'">'+data[1]+' <span class="content">'+data[2]+'</span><span class="progress-'+data[1]+'"></span></span><br>';
}
} else {
var rows_content = rows.getElementsByClassName('content');
if (!rows_content.length || rows_content[rows_content.length-1].textContent != data[2]) {
rows.innerHTML += '<span class="content">'+data[2]+'</span><span class="progress-'+data[1]+'"></span>.';
rows.innerHTML += '<span class="content">'+data[2]+'</span><span class="progress-'+data[1]+'"></span>';
}
}
break;