diff --git a/plugins/dynamix.vm.manager/VMSettings.page b/plugins/dynamix.vm.manager/VMSettings.page index cf90dab8f..68c26afbc 100644 --- a/plugins/dynamix.vm.manager/VMSettings.page +++ b/plugins/dynamix.vm.manager/VMSettings.page @@ -22,17 +22,10 @@ require_once('/usr/local/emhttp/plugins/dynamix.vm.manager/classes/libvirt_helpe // Check for Intel VT-x (vmx) or AMD-V (svm) cpu virtualzation support // If either kvm_intel or kvm_amd are loaded then Intel VT-x (vmx) or AMD-V (svm) cpu virtualzation support was found -$strLoadedModules = shell_exec("lsmod | grep '^kvm_\(amd\|intel\)'"); +$strLoadedModules = shell_exec("/etc/rc.d/rc.libvirt test"); if (empty($strLoadedModules)) { - // Attempt to load either of the kvm modules to see if virtualzation hw is supported - exec('modprobe -a kvm_intel kvm_amd 2>/dev/null'); - $strLoadedModules = shell_exec("lsmod | grep '^kvm_\(amd\|intel\)'"); - if (!empty($strLoadedModules)) { - exec('modprobe -r kvm_intel kvm_amd 2>/dev/null'); - } else { - ?>

Your hardware does not have Intel VT-x or AMD-V capability. This is required to create VMs in KVM. Click here to see the unRAID Wiki for more information

Your hardware does not have Intel VT-x or AMD-V capability. This is required to $ + exit; } @@ -123,7 +116,7 @@ if ($boolACSEnabled != $boolACSInSyslinux) {

-

Stopping the VM Manager will first attempt to shutdown all running VMs. After 40 seconds, any remaining VM instances will be terminated.

+

Stopping the VM Manager will first attempt to shutdown all running VMs. After 60 seconds, any remaining VM instances will be terminated.

diff --git a/plugins/dynamix/include/SystemInformation.php b/plugins/dynamix/include/SystemInformation.php index e8bb22299..ae10d4530 100644 --- a/plugins/dynamix/include/SystemInformation.php +++ b/plugins/dynamix/include/SystemInformation.php @@ -70,15 +70,7 @@ if (strpos($cpumodel,'@')===false) { /dev/null'); - $strLoadedModules = shell_exec("lsmod | grep '^kvm_\(amd\|intel\)'"); - if (!empty($strLoadedModules)) { - exec('modprobe -r kvm_intel kvm_amd 2>/dev/null'); - } - } + $strLoadedModules = shell_exec("/etc/rc.d/rc.libvirt test"); // Check for Intel VT-x (vmx) or AMD-V (svm) cpu virtualzation support $strCPUInfo = file_get_contents('/proc/cpuinfo');