From c40147643a80d56fa93971326179498259eb9707 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:54:28 +0100
Subject: [PATCH 1/3] Update vm_dashusage

---
 emhttp/plugins/dynamix/nchan/vm_dashusage | 36 ++++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/emhttp/plugins/dynamix/nchan/vm_dashusage b/emhttp/plugins/dynamix/nchan/vm_dashusage
index be0415b81..1b54e658a 100755
--- a/emhttp/plugins/dynamix/nchan/vm_dashusage
+++ b/emhttp/plugins/dynamix/nchan/vm_dashusage
@@ -12,17 +12,41 @@
  */
 ?>
 <?
+function get_libvird_status() {
+  $dummy = array();
+  exec("/etc/rc.d/rc.libvirt status >/dev/null",$dummy,$libvirtd);
+  $libvirtd = $libvirtd==0;
+  return $libvirtd;
+}
+
 $docroot = '/usr/local/emhttp';
 $varroot = '/var/local/emhttp';
 $md5_old = -1;
 
 require_once "$docroot/webGui/include/Helpers.php";
 require_once "$docroot/webGui/include/publish.php";
-require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
-global $vmusagestats;
-exec("/etc/rc.d/rc.libvirt status >/dev/null",$dummy,$libvirtd);
-$libvirtd = $libvirtd==0;
-if (!$libvirtd) return;
+global $vmusagestats,$var;
+$domain_cfgfile = "/boot/config/domain.cfg";
+$domain_cfg = parse_ini_file($domain_cfgfile);
+if (!isset($var)){
+  $var = @parse_ini_file("$docroot/state/var.ini");
+}
+
+# Check if array started
+if ($var['fsState'] == "Started" ) {
+  if (!get_libvird_status() && $domain_cfg['SERVICE'] == "enable") {
+    while(!get_libvird_status()) {
+      sleep(10);
+    } 
+    sleep(10);
+  } elseif ($domain_cfg['SERVICE'] != "enable") { 
+    #Add remove_nchan_pid_entry("webGui/nchan/vm_dashusage");
+    return;
+  }
+} else {
+  #Add remove_nchan_pid_entry("webGui/nchan/vm_dashusage");
+  return;
+}
 
 extract(parse_plugin_cfg('dynamix',true));
 get_vm_usage_stats();
@@ -54,8 +78,6 @@ function update_translation($locale) {
   }
 }
 
-$domain_cfgfile = "/boot/config/domain.cfg";
-$domain_cfg = parse_ini_file($domain_cfgfile);
 if (isset($domain_cfg['USAGE']) && $domain_cfg['USAGE'] != 'Y' ) return;
 if (!isset($domain_cfg['USAGETIMER'])) $timer = 3 ; else $timer = $domain_cfg['USAGETIMER'];
 

From e79a99e8d7f6025427d08a1f64d85399a78ab071 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 26 Oct 2024 13:56:52 +0100
Subject: [PATCH 2/3] Update vm_dashusage

---
 emhttp/plugins/dynamix/nchan/vm_dashusage | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emhttp/plugins/dynamix/nchan/vm_dashusage b/emhttp/plugins/dynamix/nchan/vm_dashusage
index 1b54e658a..5b9332864 100755
--- a/emhttp/plugins/dynamix/nchan/vm_dashusage
+++ b/emhttp/plugins/dynamix/nchan/vm_dashusage
@@ -48,6 +48,8 @@ if ($var['fsState'] == "Started" ) {
   return;
 }
 
+require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
+
 extract(parse_plugin_cfg('dynamix',true));
 get_vm_usage_stats();
 sleep(1);

From 227c5797d956bee3adf08b252ce8ddad8880b837 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:10:52 +0100
Subject: [PATCH 3/3] Update vm_dashusage

---
 emhttp/plugins/dynamix/nchan/vm_dashusage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/nchan/vm_dashusage b/emhttp/plugins/dynamix/nchan/vm_dashusage
index 5b9332864..94da29a75 100755
--- a/emhttp/plugins/dynamix/nchan/vm_dashusage
+++ b/emhttp/plugins/dynamix/nchan/vm_dashusage
@@ -33,7 +33,7 @@ if (!isset($var)){
 }
 
 # Check if array started
-if ($var['fsState'] == "Started" ) {
+if ($var['fsState'] == "Started" || $var['fsState'] == "Starting") {
   if (!get_libvird_status() && $domain_cfg['SERVICE'] == "enable") {
     while(!get_libvird_status()) {
       sleep(10);