diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index b71e605bd..ee8227969 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -5,8 +5,8 @@ Tag="columns"
---
$arrTemplate):
diff --git a/emhttp/plugins/dynamix.vm.manager/VMs.page b/emhttp/plugins/dynamix.vm.manager/VMs.page
index f9e5d4218..e7c76fc61 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMs.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMs.page
@@ -5,8 +5,9 @@ Lock="true"
Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")"
---
"; $iptablestr = _('Requires guest agent installed') ; }
- else { $ipliststr = "
"; $iptablestr = _('Requires guest running') ; }
+ if ($gastate == "disconnected") {
+ $ipliststr .= "
";
+ $iptablestr = _('Requires guest agent installed');
+ } else {
+ $ipliststr = "
";
+ $iptablestr = _('Requires guest running');
+ }
}
$iptablestr = str_replace("\n", "
", trim($iptablestr));
$changemedia = "getisoimageboth(\"{$uuid}\",\"hda\",\"{$cdbus}\",\"{$cdfile}\",\"hdb\",\"{$cdbus2}\",\"{$cdfile2}\")";
- $cdstr = $cdromcount." / 2
" : "' style='display:none'>");
echo "";
echo "";
- echo ""._('Disk devices')." "._('Serial')." "._('Bus')." "._('Capacity')." "._('Allocation')." Boot Order ",_('Disk devices')," ",_('Serial')," ",_('Bus')," ",_('Capacity')," ",_('Allocation')," Boot Order ";
/* Display VM disks */
@@ -207,7 +212,7 @@ foreach ($vms as $vm) {
$bus = $arrValidDiskBuses[$arrDisk['bus']] ?? 'VirtIO';
$boot= $arrDisk["boot order"];
$serial = $arrDisk["serial"];
- if ($boot < 1) $boot="Not set";
+ if ($boot < 1) $boot = _('Not set');
echo "$disk $serial $bus ";
if ($state == 'shutoff') {
echo "";
@@ -231,60 +236,56 @@ foreach ($vms as $vm) {
$capacity = $lv->format_size($arrCD['capacity'], 0);
$allocation = $lv->format_size($arrCD['allocation'], 0);
$disk = $arrCD['file'] ?? $arrCD['partition'] ?? "" ;
- $dev = $arrCD['device'];
- $bus = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
- $boot= $arrCD["boot order"] ?? "" ;
- if ($boot < 1) $boot="Not set";
+ $dev = $arrCD['device'];
+ $bus = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
+ $boot = $arrCD["boot order"] ?? "" ;
+ if ($boot < 1) $boot = _('Not set');
if ($disk != "" ) {
- $title = _("Eject CD Drive").".";
- $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\", \"--eject\")";
- echo " $disk $bus $capacity $allocation $boot $disk $bus $capacity $allocation $boot $disk $bus $capacity $allocation $boot $disk $bus $capacity $allocation $boot ";
/* Display VM IP Addresses "execute":"guest-network-get-interfaces" --pretty */
- echo ""._('Interfaces')." "._('Type')." "._('IP Address')." "._('Prefix')." ",_('Interfaces')." ",_('Type')." ",_('IP Address')," ",_('Prefix')," ";
echo $ipliststr ;
echo " ";
/* Display VM Snapshots */
if ($snapshots != null) {
- $j=0 ;
- $steps = array() ;
- foreach($snapshots as $snap) {
+ $j = 0;
+ $steps = array();
+ foreach ($snapshots as $snap) {
if ($snap['parent'] == "" || $snap['parent'] == "Base") $j++;
- $steps[$j] .= $snap['name'].';' ;
- }
- echo ""._('Snapshots')." "._('Date/Time')." "._('Type')." "._('Parent')." "._('Memory')." ";
- foreach($steps as $stepsline)
- {
- $snapshotlist = explode(";",$stepsline) ;
- $tab = " " ;
- foreach($snapshotlist as $snapshotitem) {
- if ($snapshotitem == "") continue ;
- $snapshot = $snapshots[$snapshotitem] ;
- $snapshotstate = _(ucfirst($snapshot["state"])) ;
- $snapshotdesc = $snapshot["desc"] ;
- $snapshotmemory = _(ucfirst($snapshot["memory"]["@attributes"]["snapshot"])) ;
- $snapshotparent = $snapshot["parent"] ? $snapshot["parent"] : "None";
- $snapshotdatetime = my_time($snapshot["creationtime"],"Y-m-d" )."$tab|__ ".$snapshot["name"]."$snapshotdesc $snapshotdatetime $snapshotstate $snapshotparent $snapshotmemory ",_('Snapshots')," ",_('Date/Time')," ",_('Type')," ",_('Parent')," ",_('Memory')," ";
+ foreach ($steps as $stepsline) {
+ $snapshotlist = explode(";",$stepsline);
+ $tab = " ";
+ foreach ($snapshotlist as $snapshotitem) {
+ if ($snapshotitem == "") continue;
+ $snapshot = $snapshots[$snapshotitem] ;
+ $snapshotstate = _(ucfirst($snapshot["state"]));
+ $snapshotdesc = $snapshot["desc"];
+ $snapshotmemory = _(ucfirst($snapshot["memory"]["@attributes"]["snapshot"]));
+ $snapshotparent = $snapshot["parent"] ? $snapshot["parent"] : "None";
+ $snapshotdatetime = my_time($snapshot["creationtime"],"Y-m-d" )."$tab|__ ",$snapshot["name"],"$snapshotdesc $snapshotdatetime $snapshotstate $snapshotparent $snapshotmemory ";
- }
+ }
}
echo "
";
}
-
echo "\0".implode($kvm);
?>
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMManager.php b/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
index a56278de2..435e537f2 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
@@ -1,7 +1,7 @@
saveXML();
- */
+**/
+
class Array2XML {
private static $xml = null;
private static $encoding = 'UTF-8';
@@ -160,8 +161,7 @@ private static $encoding = 'UTF-8';
}
}
-
- $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+ $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt.php";
require_once "$docroot/webGui/include/Custom.php";
@@ -756,13 +756,13 @@ private static $encoding = 'UTF-8';
$arrWhitelistGPUClassIDregex = '/^(0001|03)/';
$arrWhitelistAudioClassIDregex = '/^(0403)/';
- # "System peripheral [0880]" "Global unichip corp. [1ac1]" "Coral Edge Tpu [089a]" -pff "Global unichip corp. [1ac1]" "Coral Edge Tpu [089a]"
+ # "System peripheral [0880]" "Global unichip corp. [1ac1]" "Coral Edge Tpu [089a]" -pff "Global unichip corp. [1ac1]" "Coral Edge Tpu [089a]"
# typeid productid
# file is csv typeid:productid
#
if (is_file("/boot/config/VMPCIOverride.cfg")) {
$arrWhiteListOverride = str_getcsv(file_get_contents("/boot/config/VMPCIOverride.cfg")) ;
- }
+ }
$arrWhiteListOverride[] = "0880:089a" ;
$arrValidPCIDevices = [];
@@ -1498,7 +1498,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 false ;}
+ 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);
@@ -1518,18 +1518,18 @@ private static $encoding = 'UTF-8';
$pathinfo = pathinfo($file) ;
$capacity = $capacity + $disk["capacity"] ;
}
-
+
#Check free space.
write("addLog\0".htmlspecialchars("Checking for free space"));
$dirfree = disk_free_space($pathinfo["dirname"]) ;
- $sourcedir = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($pathinfo["dirname"])." 2>/dev/null"));
+ $sourcedir = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($pathinfo["dirname"])." 2>/dev/null"));
$repdir = str_replace('/mnt/user/', "/mnt/$sourcedir/", $pathinfo["dirname"]);
$repdirfree = disk_free_space($repdir) ;
$reflink = true ;
$capacity *= 1 ;
if ($free == "yes" && $repdirfree < $capacity) { $reflink = false ;}
- if ($free == "yes" && $dirfree < $capacity) { write("addLog\0".htmlspecialchars(_("Insufficent storage for clone"))); return false ;}
+ if ($free == "yes" && $dirfree < $capacity) { write("addLog\0".htmlspecialchars(_("Insufficent storage for clone"))); return false ;}
#Clone XML
$uuid = $lv->domain_get_uuid($vm) ;
@@ -1567,17 +1567,17 @@ private static $encoding = 'UTF-8';
chgrp($clonedir, 'users');
}
write("addLog\0".htmlspecialchars("Checking for image files"));
- if ($file_exists && $overwrite != "yes") { write("addLog\0".htmlspecialchars(_("New image file names exist and Overwrite is not allowed"))); return( false) ; }
+ if ($file_exists && $overwrite != "yes") { write("addLog\0".htmlspecialchars(_("New image file names exist and Overwrite is not allowed"))); return( false) ; }
#Create duplicate files.
foreach($file_clone as $diskid => $disk) {
$target = $disk['target'] ;
- $source = $disk['source'] ;
- if ($target == $source) { write("addLog\0".htmlspecialchars(_("New image file is same as old"))); return( false) ; }
- $sourcerealdisk = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($source)." 2>/dev/null"));
+ $source = $disk['source'] ;
+ if ($target == $source) { write("addLog\0".htmlspecialchars(_("New image file is same as old"))); return( false) ; }
+ $sourcerealdisk = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($source)." 2>/dev/null"));
$reptgt = str_replace('/mnt/user/', "/mnt/$sourcerealdisk/", $target);
$repsrc = str_replace('/mnt/user/', "/mnt/$sourcerealdisk/", $source);
-
+
$cmdstr = "cp --reflink=always '$repsrc' '$reptgt'" ;
if ($reflink == true) { $refcmd = $cmdstr ; } else {$refcmd = false; }
$cmdstr = "rsync -ahPIXS --out-format=%f --info=flist0,misc0,stats0,name1,progress2 '$source' '$target'" ;
@@ -1592,23 +1592,23 @@ private static $encoding = 'UTF-8';
file_put_contents("/tmp/clonexml" ,$xml) ;
$rtn = $lv->domain_define($xml) ;
return($rtn) ;
-
+
}
-
+
function compare_creationtime($a, $b) {
return strnatcmp($a['creationtime'], $b['creationtime']);
- }
+ }
function compare_creationtimelt($a, $b) {
return $a['creationtime'] < $b['creationtime'];
- }
+ }
function getvmsnapshots($vm) {
$snaps=array() ;
$dbpath = "/etc/libvirt/qemu/snapshot/$vm" ;
$snaps_json = file_get_contents($dbpath."/snapshots.db") ;
- $snaps = json_decode($snaps_json,true) ;
+ $snaps = json_decode($snaps_json,true) ;
if (is_array($snaps)) uasort($snaps,'compare_creationtime') ;
return $snaps ;
}
@@ -1618,7 +1618,7 @@ private static $encoding = 'UTF-8';
$dbpath = "/etc/libvirt/qemu/snapshot/$vm" ;
if (!is_dir($dbpath)) mkdir($dbpath) ;
$snaps_json = file_get_contents($dbpath."/snapshots.db") ;
- $snaps = json_decode($snaps_json,true) ;
+ $snaps = json_decode($snaps_json,true) ;
$snapshot_res=$lv->domain_snapshot_lookup_by_name($vm,$name) ;
$snapshot_xml=$lv->domain_snapshot_get_xml($snapshot_res) ;
$a = simplexml_load_string($snapshot_xml) ;
@@ -1639,10 +1639,10 @@ private static $encoding = 'UTF-8';
exec("qemu-img info --backing-chain -U '$file' | grep image:",$output) ;
foreach($output as $key => $line) {
$line=str_replace("image: ","",$line) ;
- $output[$key] = $line ;
+ $output[$key] = $line ;
}
- $snaps[$vmsnap]['backing'][$disk["device"]] = $output ;
+ $snaps[$vmsnap]['backing'][$disk["device"]] = $output ;
$rev = "r".$disk["device"] ;
$reversed = array_reverse($output) ;
$snaps[$vmsnap]['backing'][$rev] = $reversed ;
@@ -1655,7 +1655,7 @@ private static $encoding = 'UTF-8';
if (array_key_exists(0 , $b["disks"]["disk"])) $snaps[$vmsnap]["disks"]= $b["disks"]["disk"]; else $snaps[$vmsnap]["disks"][0]= $b["disks"]["disk"];
-
+
$value = json_encode($snaps,JSON_PRETTY_PRINT) ;
file_put_contents($dbpath."/snapshots.db",$value) ;
}
@@ -1665,7 +1665,7 @@ private static $encoding = 'UTF-8';
$dbpath = "/etc/libvirt/qemu/snapshot/$vm" ;
if (!is_dir($dbpath)) mkdir($dbpath) ;
$snaps_json = file_get_contents($dbpath."/snapshots.db") ;
- $snaps = json_decode($snaps_json,true) ;
+ $snaps = json_decode($snaps_json,true) ;
foreach($snaps as $vmsnap=>$snap)
$disks =$lv->get_disk_stats($vm) ;
@@ -1675,10 +1675,10 @@ private static $encoding = 'UTF-8';
exec("qemu-img info --backing-chain -U '$file' | grep image:",$output) ;
foreach($output as $key => $line) {
$line=str_replace("image: ","",$line) ;
- $output[$key] = $line ;
+ $output[$key] = $line ;
}
-
- $snaps[$vmsnap]['backing'][$disk["device"]] = $output ;
+
+ $snaps[$vmsnap]['backing'][$disk["device"]] = $output ;
$rev = "r".$disk["device"] ;
$reversed = array_reverse($output) ;
$snaps[$vmsnap]['backing'][$rev] = $reversed ;
@@ -1688,7 +1688,7 @@ private static $encoding = 'UTF-8';
$snaps[$vmsnap]["parent"]= $parendfileinfo["extension"];
$snaps[$vmsnap]["parent"] = str_replace("qcow2",'',$snaps[$vmsnap]["parent"]) ;
if (isset($parentfind[1]) && !isset($parentfind[2])) $snaps[$vmsnap]["parent"]="Base" ;
-
+
$value = json_encode($snaps,JSON_PRETTY_PRINT) ;
$res = $lv->get_domain_by_name($vm);
#if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
@@ -1697,12 +1697,12 @@ private static $encoding = 'UTF-8';
#Remove any NVRAMs that are no longer valid.
# Get uuid
$vmuuid = $lv->domain_get_uuid($vm) ;
- #Get list of files
- #$filepath = "/etc/libvirt/qemu/nvram/'.$uuid*" ; #$snapshotname"
- $filepath = "/etc/libvirt/qemu/nvram/$vmuuid*" ; #$snapshotname"
+ #Get list of files
+ #$filepath = "/etc/libvirt/qemu/nvram/'.$uuid*" ; #$snapshotname"
+ $filepath = "/etc/libvirt/qemu/nvram/$vmuuid*" ; #$snapshotname"
$nvram_files=glob($filepath) ;
foreach($nvram_files as $key => $nvram_file) {
- if ($nvram_file == "/etc/libvirt/qemu/nvram/$vmuuid"."_VARS-pure-efi.fd" || $nvram_file == "/etc/libvirt/qemu/nvram/$vmuuid"."_VARS-pure-efi-tpm.fd" ) unset($nvram_files[$key]) ;
+ if ($nvram_file == "/etc/libvirt/qemu/nvram/$vmuuid"."_VARS-pure-efi.fd" || $nvram_file == "/etc/libvirt/qemu/nvram/$vmuuid"."_VARS-pure-efi-tpm.fd" ) unset($nvram_files[$key]) ;
foreach ($snaps as $snapshotname => $snap) {
$tpmfilename = "/etc/libvirt/qemu/nvram/".$vmuuid.$snapshotname."_VARS-pure-efi-tpm.fd" ;
$nontpmfilename = "/etc/libvirt/qemu/nvram/".$vmuuid.$snapshotname."_VARS-pure-efi.fd" ;
@@ -1712,7 +1712,7 @@ private static $encoding = 'UTF-8';
}
foreach ($nvram_files as $nvram_file) unlink($nvram_file) ;
-
+
file_put_contents($dbpath."/snapshots.db",$value) ;
}
@@ -1720,7 +1720,7 @@ private static $encoding = 'UTF-8';
global $lv ;
$dbpath = "/etc/libvirt/qemu/snapshot/$vm" ;
$snaps_json = file_get_contents($dbpath."/snapshots.db") ;
- $snaps = json_decode($snaps_json,true) ;
+ $snaps = json_decode($snaps_json,true) ;
unset($snaps[$name]) ;
$value = json_encode($snaps,JSON_PRETTY_PRINT) ;
file_put_contents($dbpath."/snapshots.db",$value) ;
@@ -1730,19 +1730,19 @@ private static $encoding = 'UTF-8';
function vm_snapshot($vm,$snapshotname, $snapshotdesc, $free = "yes", $memorysnap = "yes") {
global $lv ;
-
+
#Get State
$res = $lv->get_domain_by_name($vm);
$dom = $lv->domain_get_info($res);
$state = $lv->domain_state_translate($dom['state']);
-
- #Get disks for --diskspec
+
+ #Get disks for --diskspec
$disks =$lv->get_disk_stats($vm) ;
$diskspec = "" ;
$capacity = 0 ;
if ($snapshotname == "--generate") $name= "S" . date("YmdHis") ; else $name=$snapshotname ;
if ($snapshotdesc != "") $snapshotdesc = " --description '$snapshotdesc'" ;
-
+
foreach($disks as $disk) {
$file = $disk["file"] ;
$pathinfo = pathinfo($file) ;
@@ -1754,38 +1754,38 @@ private static $encoding = 'UTF-8';
#get memory
$mem = $lv->domain_get_memory_stats($vm) ;
$memory = $mem[6] ;
-
+
if ($memorysnap = "yes") $memspec = ' --memspec "'.$pathinfo["dirname"].'/memory'.$name.'.mem",snapshot=external' ; else $memspec = "" ;
$cmdstr = "virsh snapshot-create-as '$vm' --name '$name' $snapshotdesc --atomic" ;
-
-
+
+
if ($state == "running") {
$cmdstr .= " --live ".$memspec.$diskspec ;
$capacity = $capacity + $memory ;
-
+
} else {
- $cmdstr .= " --disk-only ".$diskspec ;
+ $cmdstr .= " --disk-only ".$diskspec ;
}
-
+
#Check free space.
$dirfree = disk_free_space($pathinfo["dirname"]) ;
-
+
$capacity *= 1 ;
-
- if ($free == "yes" && $dirfree < $capacity) { $arrResponse = ['error' => _("Insufficent Storage for Snapshot")]; return $arrResponse ;}
-
+
+ if ($free == "yes" && $dirfree < $capacity) { $arrResponse = ['error' => _("Insufficent Storage for Snapshot")]; return $arrResponse ;}
+
#Copy nvram
if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
$xmlfile = $pathinfo["dirname"]."/".$name.".running" ;
file_put_contents("/tmp/xmltst", "$xmlfile" ) ;
if ($state == "running") exec("virsh dumpxml '$vm' > ".escapeshellarg($xmlfile),$outxml,$rtnxml) ;
-
+
$output= [] ;
$test = false ;
if ($test) exec($cmdstr." --print-xml 2>&1",$output,$return) ; else exec($cmdstr." 2>&1",$output,$return) ;
- if (strpos(" ".$output[0],"error") ) {
+ if (strpos(" ".$output[0],"error") ) {
$arrResponse = ['error' => substr($output[0],6) ] ;
} else {
$arrResponse = ['success' => true] ;
@@ -1803,8 +1803,8 @@ private static $encoding = 'UTF-8';
$disks =$lv->get_disk_stats($vm) ;
switch ($snapslist[$snap]['state']) {
- case "shutoff":
- case "running":
+ case "shutoff":
+ case "running":
#VM must be shutdown.
$res = $lv->get_domain_by_name($vm);
$dom = $lv->domain_get_info($res);
@@ -1817,7 +1817,7 @@ private static $encoding = 'UTF-8';
$xmlobj = custom::createArray('domain',$strXML) ;
# Process disks and update path.
- $disks=($snapslist[$snap]['disks']) ;
+ $disks=($snapslist[$snap]['disks']) ;
foreach ($disks as $disk) {
$diskname = $disk["@attributes"]["name"] ;
if ($diskname == "hda" || $diskname == "hdb") continue ;
@@ -1859,7 +1859,7 @@ private static $encoding = 'UTF-8';
$item++ ;
}
}
-
+
uasort($snapslist,'compare_creationtimelt') ;
foreach($snapslist as $s) {
$name = $s['name'] ;
@@ -1877,13 +1877,13 @@ private static $encoding = 'UTF-8';
# Restore Memory.
$makerun = true ;
- if ($makerun == true) exec("virsh restore ".escapeshellarg($memoryfile)) ;
- #exec("virsh restore $memoryfile") ;
- }
+ if ($makerun == true) exec("virsh restore ".escapeshellarg($memoryfile)) ;
+ #exec("virsh restore $memoryfile") ;
+ }
#Delete Metadata only.
- if ($actionmeta == "yes") {
+ if ($actionmeta == "yes") {
$ret = delete_snapshots_database("$vm","$name") ;
- }
+ }
if (is_file($memoryfile) && $action == "yes") unlink($memoryfile) ;
if (is_file($xmlfile) && $action == "yes") unlink($xmlfile) ;
if ($s['name'] == $snap) break ;
@@ -1891,11 +1891,11 @@ private static $encoding = 'UTF-8';
#if VM was started restart.
if ($state == 'running' && $snapslist[$snap]['state'] != "running") {
$arrResponse = $lv->domain_start($vm) ;
- }
-
+ }
+
if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_revert_snapshot($lv->domain_get_uuid($vm),$name) ;
break ;
-
+
}
$arrResponse = ['success' => true] ;
return($arrResponse) ;
@@ -1914,9 +1914,9 @@ private static $encoding = 'UTF-8';
exec("qemu-img info --backing-chain -U '$file' | grep image:",$output) ;
foreach($output as $key => $line) {
$line=str_replace("image: ","",$line) ;
- $output[$key] = $line ;
+ $output[$key] = $line ;
}
- $snaps[$vm][$disk["device"]] = $output ;
+ $snaps[$vm][$disk["device"]] = $output ;
$rev = "r".$disk["device"] ;
$reversed = array_reverse($output) ;
$snaps[$vm][$rev] = $reversed ;
@@ -1927,7 +1927,7 @@ private static $encoding = 'UTF-8';
}
$snapdisks= $snapslist[$snap]['disks'] ;
-
+
foreach ($snapdisks as $diskkey => $snapdisk) {
$diskname = $snapdisk["@attributes"]["name"] ;
if ($diskname == "hda" || $diskname == "hdb") continue ;
@@ -1940,7 +1940,7 @@ private static $encoding = 'UTF-8';
{
if (!isset($snaps[$vm]["r".$diskname][$item])) break ;
$newpath = $snaps[$vm]["r".$diskname][$item] ;
- if (is_file($path)) $data .= "$newpath
","addLog\0"._('Command execution')." ".basename($cmd).' '.str_replace(" -",""._('Please wait')."
$out ");
- return $retval===0;
+ $waitID = mt_rand();
+ [$cmd,$args] = explode(' ',$command,2);
+ write("
","addLog\0"._('Command execution')." ".basename($cmd).' '.str_replace(" -",""._('Please wait')."
$out ");
+ return $retval===0;
}
#{action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc}
@@ -65,10 +66,10 @@ $style[] = "legend{font-size:1.1rem!important;font-weight:bold}";
$style[] = "";
foreach (explode('&', $url) as $chunk) {
- $param = explode("=", $chunk);
- if ($param) {
- ${urldecode($param[0])} = urldecode($param[1]) ;
- }
+ $param = explode("=", $chunk);
+ if ($param) {
+ ${urldecode($param[0])} = urldecode($param[1]) ;
+ }
}
$id = 1 ;
write(implode($style)."
");
@@ -78,24 +79,23 @@ write("addLog\0".htmlspecialchars("VMName $name "));
write("addLog\0".htmlspecialchars("SNAP $snapshotname "));
write("addLog\0".htmlspecialchars("Base $targetbase "));
if ($action == "commit") {
- write("addLog\0".htmlspecialchars("Top $targettop "));
- write("addLog\0".htmlspecialchars("Pivot $targetpivot "));
- write("addLog\0".htmlspecialchars("Delete $targetdelete "));
+ write("addLog\0".htmlspecialchars("Top $targettop "));
+ write("addLog\0".htmlspecialchars("Pivot $targetpivot "));
+ write("addLog\0".htmlspecialchars("Delete $targetdelete "));
}
switch ($action) {
- case "commit":
- vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$targetpivot,$targetdelete) ;
- break ;
- case "copy":
- vm_blockcopy($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ;
- break;
- case "pull":
- vm_blockpull($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ;
- break ;
-
- }
+case "commit":
+ vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$targetpivot,$targetdelete) ;
+ break ;
+case "copy":
+ vm_blockcopy($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ;
+ break;
+case "pull":
+ vm_blockpull($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ;
+ break ;
+}
#execCommand_nchan("ls /") ;
write("stop_Wait\0$waitID") ;
write('_DONE_','');
-?>
\ No newline at end of file
+?>
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
index 2c33227f7..2cdd7a319 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
@@ -1,6 +1,7 @@
#!/usr/bin/php -q
'http://localhost/pub/vmaction?buffer_length=1',
- CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
- CURLOPT_POST => 1,
- CURLOPT_RETURNTRANSFER => true
- ]);
- foreach ($messages as $message) {
- curl_setopt($com, CURLOPT_POSTFIELDS, $message);
- curl_exec($com);
- }
- curl_close($com);
- }
- function execCommand_nchan_clone($command,$idx,$refcmd=false) {
- $waitID = mt_rand();
- if ($refcmd) {
- [$cmd,$args] = explode(' ',$refcmd,2);
- write("
","addLog\0"._('Command execution')." ".basename($cmd).' '.str_replace(" -",""._('Please wait')."
{$output[0]} ");
- }
- $out = $return ? _('The command failed revert to rsync')."." : _('The command finished successfully').'!';
- write("stop_Wait\0$waitID","addLog\0$out ");
- }
- if ($reflinkok) {
- return true ;
- } else {
- $waitID = mt_rand();
- [$cmd,$args] = explode(' ',$command,2);
- write("
","addLog\0"._('Command execution')." ".basename($cmd).' '.str_replace(" -",""._('Please wait')."
$out ");
- return $retval===0;
+function write(...$messages) {
+ $com = curl_init();
+ curl_setopt_array($com,[
+ CURLOPT_URL => 'http://localhost/pub/vmaction?buffer_length=1',
+ CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+ CURLOPT_POST => 1,
+ CURLOPT_RETURNTRANSFER => true
+ ]);
+ foreach ($messages as $message) {
+ curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+ curl_exec($com);
+ }
+ curl_close($com);
+}
+
+function execCommand_nchan_clone($command,$idx,$refcmd=false) {
+ $waitID = mt_rand();
+ if ($refcmd) {
+ [$cmd,$args] = explode(' ',$refcmd,2);
+ write("
","addLog\0"._('Command execution')." ".basename($cmd).' '.str_replace(" -",""._('Please wait')."
{$output[0]} ");
+ }
+ $out = $return ? _('The command failed revert to rsync')."." : _('The command finished successfully').'!';
+ write("stop_Wait\0$waitID","addLog\0$out ");
+ }
+ if ($reflinkok) {
+ return true ;
+ } else {
+ $waitID = mt_rand();
+ [$cmd,$args] = explode(' ',$command,2);
+ write("
","addLog\0"._('Command execution')." ".basename($cmd).' '.str_replace(" -",""._('Please wait')."
$out ");
+ return $retval===0;
}
}
@@ -86,10 +85,10 @@ $style[] = "legend{font-size:1.1rem!important;font-weight:bold}";
$style[] = "";
foreach (explode('&', $url) as $chunk) {
- $param = explode("=", $chunk);
- if ($param) {
- ${urldecode($param[0])} = urldecode($param[1]) ;
- }
+ $param = explode("=", $chunk);
+ if ($param) {
+ ${urldecode($param[0])} = urldecode($param[1]) ;
+ }
}
$id = 1 ;
write(implode($style)."
");
@@ -99,10 +98,10 @@ write("
","addLog\0"._("O
write("addLog\0".htmlspecialchars("Cloning $name to $clone"));
switch ($action) {
- case "clone":
- $rtn = vm_clone($name,$clone,$overwrite,$start,$edit,$free,$waitID) ;
- break ;
- }
+case "clone":
+ $rtn = vm_clone($name,$clone,$overwrite,$start,$edit,$free,$waitID) ;
+ break ;
+}
write("stop_Wait\0$waitID") ;
if ($rtn) write('_DONE_',''); else write('_ERROR_','');
-?>
\ No newline at end of file
+?>
diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
index 0abb29c13..705cc8381 100644
--- a/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
+++ b/emhttp/plugins/dynamix.vm.manager/sheets/VMMachines.css
@@ -15,7 +15,8 @@ table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
table.snapshot{margin-top:0}
i.mover{margin-right:8px;display:none}
+i.fa-floppy-o{padding-left:12px}
#resetsort{margin-left:12px;display:inline-block;width:32px}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
.dropdown-menu{z-index:10001}
-span.vmgraphics{font-size:1.1rem;text-align: left}
+span.vmgraphics{font-size:1.1rem;text-align:left}
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 939d352ed..256b831f6 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1,7 +1,7 @@
-
-
>_(Enable USB boot)_:
-
+
onchange="USBBootChange(this)">
vDisk Bus
vDisk Boot Order
-
+
vDisk Serial
-
+
_(Boot Order)_:
@@ -868,7 +869,7 @@
_(Unraid Share)_:
-
-
@@ -1196,13 +1197,13 @@
$domain_bridge,
'mac' => "",
'model' => 'virtio-net'
] ;
- }
+ }
foreach ($arrConfig['nic'] as $i => $arrNic) {
$strLabel = ($i > 0) ? appendOrdinalSuffix($i + 1) : '';
@@ -1326,7 +1327,7 @@
- $domain_bridge,
'mac' => "",
'model' => 'virtio-net'
] ;
- }
+ }
foreach ($arrConfig['nic'] as $i => $arrNic) {
$strLabel = ($i > 0) ? appendOrdinalSuffix($i + 1) : '';
@@ -951,7 +952,7 @@ $hdrXML = "\n"; // XML encoding declaratio