From 8b495f87ebf7c70b9c9f9d4c22ecde75334b3ccb Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 8 May 2024 20:41:24 +0100
Subject: [PATCH 01/16] Updates for image removal

---
 .../plugins/dynamix.vm.manager/VMSettings.page   |  3 +--
 etc/rc.d/rc.libvirt                              | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 99d2501a3c..81e36a9292 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -67,8 +67,7 @@ $libvirt_log       = file_exists("/var/log/libvirt/libvirtd.log");
 <?endif;?>
 <form markdown="1" id="settingsForm" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="<?=htmlspecialchars($domain_cfgfile)?>">
-<input type="hidden" name="#command" value="/plugins/dynamix/scripts/emcmd">
-<input type="hidden" name="#arg[1]" value="cmdStatus=Apply">
+<input type="hidden" name="#command" value="/plugins/dynamix.vm.manager/scripts/actionlibvirt">
 _(Enable VMs)_:
 : <select id="SERVICE" name="SERVICE">
   <?= mk_option($libvirt_service, 'disable', _('No'))?>
diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index e41bc61b61..4995fb06df 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -173,10 +173,7 @@ version(){
 
 libvirtd_start(){
   log "Starting $DAEMON..."
-  if ! mountpoint /etc/libvirt &>/dev/null; then
-    log "$DAEMON...  No image mounted at /etc/libvirt."
-    exit 1
-  elif [[ -f $LIBVIRTD_PIDFILE ]]; then
+  if [[ -f $LIBVIRTD_PIDFILE ]]; then
     log "$DAEMON...  Already started."
     return 1
   fi
@@ -317,6 +314,14 @@ libvirtd_cleanup(){
   sleep 1
 }
 
+check_cfg_status{
+  if [ "$SERVICE" == "enable" ]; then
+  libvirtd_start
+  else
+  libvirtd_stop
+  fi
+}
+
 case "$1" in
 'test')
   libvirtd_test
@@ -341,6 +346,9 @@ case "$1" in
   virtlogd_start
   libvirtd_start
   ;;
+'update')
+  check_cfg_status
+  ;;  
 'status')
   libvirtd_status
   ;;

From 666397561289e0c62b18b4e8eb6d0e338ed09459 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 8 May 2024 21:34:19 +0100
Subject: [PATCH 02/16] Update VMSettings.page

---
 emhttp/plugins/dynamix.vm.manager/VMSettings.page | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 81e36a9292..1380c823c3 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -67,7 +67,8 @@ $libvirt_log       = file_exists("/var/log/libvirt/libvirtd.log");
 <?endif;?>
 <form markdown="1" id="settingsForm" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="<?=htmlspecialchars($domain_cfgfile)?>">
-<input type="hidden" name="#command" value="/plugins/dynamix.vm.manager/scripts/actionlibvirt">
+<input type="hidden" name="#command" value="/etc/rc.d/rc.libvirt">
+<input type="hidden" name="#arg[1]" value="update">
 _(Enable VMs)_:
 : <select id="SERVICE" name="SERVICE">
   <?= mk_option($libvirt_service, 'disable', _('No'))?>
@@ -124,7 +125,7 @@ _(Libvirt storage location)_:
 
 <?endif;?>
 _(Default VM storage path)_:
-: <input type="text" id="domaindir" name="DOMAINDIR" autocomplete="off" spellcheck="false" data-pickfolders="true" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="/mnt" value="<?=htmlspecialchars($domain_cfg['DOMAINDIR'])?>" placeholder="_(Click to Select)_" pattern="^[^\\]*/$">
+: <input type="text" id="domaindir" name="DOMAINDIR" autocomplete="off" spellcheck="false" data-pickfolders="true" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="<?=is_dir('/mnt/user')?'/mnt/user':'/mnt'?>" value="<?=htmlspecialchars($domain_cfg['DOMAINDIR'])?>" placeholder="_(Click to Select)_" pattern="^[^\\]*/$">
   <?if (!$started):?><span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
   <?elseif (!is_dir($domain_cfg['DOMAINDIR'])):?><span><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span><?endif;?>
 

From 12da995ddfa9649fac1150f9d2914f2b0a789c17 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 8 May 2024 21:39:44 +0100
Subject: [PATCH 03/16] Update rc.libvirt

---
 etc/rc.d/rc.libvirt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index 4995fb06df..4bcbaed82e 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -316,9 +316,14 @@ libvirtd_cleanup(){
 
 check_cfg_status{
   if [ "$SERVICE" == "enable" ]; then
-  libvirtd_start
+    libvirtd_start
+    virtlogd_start
+    libvirtd_start
   else
-  libvirtd_stop
+    libvirtd_stop
+    virtlogd_stop
+    virtlockd_stop
+    libvirtd_cleanup
   fi
 }
 

From 81dd45a490b7d955044ffedb78537a0f3722933d Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Thu, 9 May 2024 21:53:16 +0100
Subject: [PATCH 04/16] Add libvirt_update script

---
 emhttp/plugins/dynamix.vm.manager/VMSettings.page     |  3 +--
 .../plugins/dynamix.vm.manager/scripts/libvirt_update | 11 +++++++++++
 etc/rc.d/rc.libvirt                                   |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 1380c823c3..b7d70c7ed6 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -67,8 +67,7 @@ $libvirt_log       = file_exists("/var/log/libvirt/libvirtd.log");
 <?endif;?>
 <form markdown="1" id="settingsForm" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="<?=htmlspecialchars($domain_cfgfile)?>">
-<input type="hidden" name="#command" value="/etc/rc.d/rc.libvirt">
-<input type="hidden" name="#arg[1]" value="update">
+<input type="hidden" name="#command" value="/plugins/dynamix.vm.manager/scripts/libvirt_update">
 _(Enable VMs)_:
 : <select id="SERVICE" name="SERVICE">
   <?= mk_option($libvirt_service, 'disable', _('No'))?>
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update b/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update
new file mode 100644
index 0000000000..0c1d2f9130
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Process settings update.
+if [ -f /boot/config/domain.cfg ]; then
+  . /boot/config/domain.cfg
+  if [ "$SERVICE" == "enable" ]; then
+    /etc/rc.d/rc.libvirt start
+  else
+    /etc/rc.d/rc.libvirt stop
+  fi
+fi
diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index 4bcbaed82e..6cf981bd09 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -314,7 +314,7 @@ libvirtd_cleanup(){
   sleep 1
 }
 
-check_cfg_status{
+check_cfg_status(){
   if [ "$SERVICE" == "enable" ]; then
     libvirtd_start
     virtlogd_start

From c1cf813809e94ea6f5ff9824ccbcd120185c8fa3 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Thu, 9 May 2024 21:54:59 +0100
Subject: [PATCH 05/16] Make script executable

---
 emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update

diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update b/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update
old mode 100644
new mode 100755

From ea49630d169508ca815e9a733adb56afdaedd440 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Fri, 10 May 2024 20:42:26 +0100
Subject: [PATCH 06/16] Update rc.libvirt

---
 etc/rc.d/rc.libvirt | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index 6cf981bd09..60c1bdf8ba 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -314,19 +314,6 @@ libvirtd_cleanup(){
   sleep 1
 }
 
-check_cfg_status(){
-  if [ "$SERVICE" == "enable" ]; then
-    libvirtd_start
-    virtlogd_start
-    libvirtd_start
-  else
-    libvirtd_stop
-    virtlogd_stop
-    virtlockd_stop
-    libvirtd_cleanup
-  fi
-}
-
 case "$1" in
 'test')
   libvirtd_test
@@ -351,9 +338,6 @@ case "$1" in
   virtlogd_start
   libvirtd_start
   ;;
-'update')
-  check_cfg_status
-  ;;  
 'status')
   libvirtd_status
   ;;

From f2822c7db701f6cafa2ee145eb4dafec79536ef8 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 19 Apr 2025 18:35:30 +0100
Subject: [PATCH 07/16] Changes to VM Settings

---
 emhttp/plugins/dynamix.vm.manager/VMSettings.page     |  9 ++++++---
 .../plugins/dynamix.vm.manager/scripts/libvirt_update | 11 -----------
 2 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100755 emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index b7d70c7ed6..9d331c9a6f 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -67,7 +67,9 @@ $libvirt_log       = file_exists("/var/log/libvirt/libvirtd.log");
 <?endif;?>
 <form markdown="1" id="settingsForm" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="<?=htmlspecialchars($domain_cfgfile)?>">
-<input type="hidden" name="#command" value="/plugins/dynamix.vm.manager/scripts/libvirt_update">
+<input type="hidden" name="#command" value="/plugins/dynamix/scripts/emcmd">
+<input type="hidden" name="#arg[1]" value="cmdStatus=Apply">
+<input type="hidden" id="OLD_IMAGE_FILE" name="OLD_IMAGE_FILE" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>">
 _(Enable VMs)_:
 : <select id="SERVICE" name="SERVICE">
   <?= mk_option($libvirt_service, 'disable', _('No'))?>
@@ -96,6 +98,7 @@ _(Disable Autostart/Start option for VMs)_:
 <?if ($libvirt_up):?>
 <?$libvirt_info = libvirt_version('libvirt')?>
 <?$qemu_info = $lv->get_connect_information()?>
+
 _(Libvirt version)_:
 : <?=$libvirt_info['libvirt.major'].'.'.$libvirt_info['libvirt.minor'].'.'.$libvirt_info['libvirt.release']?>
 
@@ -114,7 +117,7 @@ _(Libvirt vdisk size)_:
 :vms_libvirt_vdisk_size_help:
 
 _(Libvirt storage location)_:
-: <input type="text" id="IMAGE_FILE" name="IMAGE_FILE" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" required pattern="^[^\\]*libvirt\.img$">
+: <input type="text" id="IMAGE_FILE" name="IMAGE_FILE" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
  <?if (file_exists($domain_cfg['IMAGE_FILE'])):?><span id="deletePanel"><label><input type="checkbox" id="deleteCheckbox" /> _(Delete Image File)_</label></span><?endif;?>
  <?if (!$started):?><span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
  <?elseif (!is_dir(dirname($domain_cfg['IMAGE_FILE']))):?><span><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
@@ -230,7 +233,7 @@ _(VFIO allow unsafe interrupts)_:
 
 <?endif;?>
 
-<?if ($libvirt_up && trim(shell_exec('stat -c %T -f /etc/libvirt'))=='btrfs'):?>
+<?if ($libvirt_up && trim(shell_exec('stat -c %T -f /etc/libvirt'))=='btrfs' && strpos($domain_cfg['IMAGE_FILE'],".img")) :?>
 <div class="advanced" markdown="1">
 <div class="title"><span class="left"><i class="title fa fa-list"></i>_(Libvirt volume info)_</span></div>
 _(btrfs filesystem show)_:
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update b/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update
deleted file mode 100755
index 0c1d2f9130..0000000000
--- a/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_update
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Process settings update.
-if [ -f /boot/config/domain.cfg ]; then
-  . /boot/config/domain.cfg
-  if [ "$SERVICE" == "enable" ]; then
-    /etc/rc.d/rc.libvirt start
-  else
-    /etc/rc.d/rc.libvirt stop
-  fi
-fi

From 28ec84805a0e3c1e5a1453ef1272e10a81262e5e Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 19 Apr 2025 18:40:16 +0100
Subject: [PATCH 08/16] revert rc.libvirt changes

---
 etc/rc.d/rc.libvirt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index 60c1bdf8ba..013220079e 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -173,7 +173,10 @@ version(){
 
 libvirtd_start(){
   log "Starting $DAEMON..."
-  if [[ -f $LIBVIRTD_PIDFILE ]]; then
+    if ! mountpoint /etc/libvirt &>/dev/null; then
+    log "$DAEMON...  No image mounted at /etc/libvirt."
+    exit 1
+  elif [[ -f $LIBVIRTD_PIDFILE ]]; then
     log "$DAEMON...  Already started."
     return 1
   fi

From de53cf49e28892bc8a6457d31978884ebedece8a Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 20 Apr 2025 10:19:42 +0100
Subject: [PATCH 09/16] Initial moving libvirt image to folder and vice versa.

Default set to folder.
---
 .../dynamix.vm.manager/VMSettings.page        | 18 ++++++
 .../dynamix.vm.manager/scripts/libvirt_init   | 58 +++++++++++++++++++
 .../dynamix.vm.manager/scripts/libvirtconfig  |  3 +-
 etc/rc.d/rc.libvirt                           |  2 +-
 4 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 9d331c9a6f..1a5851576d 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -110,6 +110,12 @@ _(Libvirt storage location)_:
 
 :vms_libvirt_volume_help:
 
+_(Libvirt secondary storage location)_:
+: <?=htmlspecialchars($domain_cfg['IMAGE_FILE_SECONDARY'])."Test"?>
+
+:vms_libvirt_secondary_volume_help:
+
+
 <?else: /* Libvirt is stopped */ ?>
 _(Libvirt vdisk size)_:
 : <input type="number" id="IMAGE_SIZE" name="IMAGE_SIZE" min="1" value="<?=htmlspecialchars($domain_cfg['IMAGE_SIZE']);?>" style="width:50px;" required="required" />_(GB)_ <span id="SIZE_ERROR" class="errortext"></span>
@@ -125,6 +131,14 @@ _(Libvirt storage location)_:
 
 :vms_libvirt_location_help:
 
+_(Libvirt secondary storage location)_:
+: <input type="text" id="IMAGE_FILE_SECONDARY" name="IMAGE_FILE_SECONDARY" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE_SECONDARY']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
+ <?if (!$started):?><span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
+ <?elseif (!is_dir(dirname($domain_cfg['IMAGE_FILE_SECONDARY']))):?><span><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
+ <?endif;?><span id="IMAGE_ERROR_SECONDARY" class="errortext"></span>
+
+:vms_libvirt_secondary_location_help:
+
 <?endif;?>
 _(Default VM storage path)_:
 : <input type="text" id="domaindir" name="DOMAINDIR" autocomplete="off" spellcheck="false" data-pickfolders="true" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="<?=is_dir('/mnt/user')?'/mnt/user':'/mnt'?>" value="<?=htmlspecialchars($domain_cfg['DOMAINDIR'])?>" placeholder="_(Click to Select)_" pattern="^[^\\]*/$">
@@ -428,6 +442,9 @@ $(function(){
   $("#IMAGE_FILE").fileTreeAttach(null, null, function(folder) {
     $("#IMAGE_FILE").val(folder + 'libvirt.img').change();
   });
+  $("#IMAGE_FILE_SECONDARY").fileTreeAttach(null, null, function(folder) {
+    $("#IMAGE_FILE_SECONDARY").val(folder + 'libvirt.img').change();
+  });
   $('#domaindir').fileTreeAttach();
   $('#mediadir').fileTreeAttach();
   $('#winvirtio').fileTreeAttach();
@@ -451,6 +468,7 @@ $(function(){
       $("#SERVICE").prop("disabled", checked).val('disable');
       $("#IMAGE_SIZE").prop("disabled", checked);
       $("#IMAGE_FILE").prop("disabled", checked).val("<?=$domain_cfg['IMAGE_FILE']?>");
+      $("#IMAGE_FILE_SECONDARY").prop("disabled");
       $("#domaindir").prop("disabled", checked);
       $("#mediadir").prop("disabled", checked);
       $("#winvirtio_select").prop("disabled", checked);
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_init b/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_init
index 4b98d16f0c..1189383f11 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_init
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/libvirt_init
@@ -5,6 +5,64 @@
 # run & log functions
 . /etc/rc.d/rc.runlog
 
+
+# Sync domain data if IMAGE_FILE and OLD_IMAGE_FILE differ
+DOMAIN_CFG=/boot/config/domain.cfg
+
+# Read values from domain.cfg
+eval $(grep -E '^(IMAGE_FILE|OLD_IMAGE_FILE)=' "$DOMAIN_CFG")
+
+# Remove quotes
+IMAGE_FILE="${IMAGE_FILE%\"}"
+IMAGE_FILE="${IMAGE_FILE#\"}"
+OLD_IMAGE_FILE="${OLD_IMAGE_FILE%\"}"
+OLD_IMAGE_FILE="${OLD_IMAGE_FILE#\"}"
+
+# Proceed only if both variables are set and OLD_IMAGE_FILE exists
+if [ -n "$IMAGE_FILE" ] && [ -n "$OLD_IMAGE_FILE" ] && [ "$IMAGE_FILE" != "$OLD_IMAGE_FILE" ]; then
+  if [ ! -e "$OLD_IMAGE_FILE" ]; then
+    log "OLD_IMAGE_FILE not found: $OLD_IMAGE_FILE — skipping sync"
+  else
+    log "IMAGE_FILE and OLD_IMAGE_FILE differ, syncing..."
+
+    TMP_MNT=/etc/libvirt-sync
+    IMG_FILE_NAME=$(basename "$IMAGE_FILE")
+    OLD_IMG_FILE_NAME=$(basename "$OLD_IMAGE_FILE")
+    TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+
+    if [[ "$OLD_IMAGE_FILE" == *.img ]]; then
+      # Backup image before mounting
+      BACKUP_PATH="${OLD_IMAGE_FILE%.img}.bak-${TIMESTAMP}.img"
+      log "Creating backup of OLD_IMAGE_FILE: $BACKUP_PATH"
+      cp -p "$OLD_IMAGE_FILE" "$BACKUP_PATH"
+
+      log "Mounting $OLD_IMAGE_FILE to $TMP_MNT"
+      mkdir -p "$TMP_MNT"
+      mount "$OLD_IMAGE_FILE" "$TMP_MNT"
+      log "Copying full contents from image to directory $IMAGE_FILE"
+      rsync -a --exclude="$OLD_IMG_FILE_NAME" "$TMP_MNT/" "$IMAGE_FILE/"
+      umount "$TMP_MNT"
+    elif [[ "$IMAGE_FILE" == *.img ]]; then
+      log "Mounting $IMAGE_FILE to $TMP_MNT"
+      mkdir -p "$TMP_MNT"
+      mount "$IMAGE_FILE" "$TMP_MNT"
+      log "Copying full contents from directory $OLD_IMAGE_FILE to image"
+      rsync -a --exclude="$IMG_FILE_NAME" --exclude='*.bak-*.img' "$OLD_IMAGE_FILE/" "$TMP_MNT/"
+      umount "$TMP_MNT"
+    else
+      log "Both IMAGE_FILE and OLD_IMAGE_FILE are directories, copying full contents"
+      rsync -a --exclude="$IMG_FILE_NAME" "$OLD_IMAGE_FILE/" "$IMAGE_FILE/"
+    fi
+
+    # Update OLD_IMAGE_FILE in domain.cfg
+    log "Updating OLD_IMAGE_FILE in $DOMAIN_CFG"
+    sed -i "s|^OLD_IMAGE_FILE=.*|OLD_IMAGE_FILE=\"$IMAGE_FILE\"|" "$DOMAIN_CFG"
+  fi
+else
+  log "IMAGE_FILE and OLD_IMAGE_FILE match, or one is unset — skipping sync"
+fi
+
+
 # missing qemu directory would indicate new libvirt image file created
 if [ ! -d /etc/libvirt/qemu ]; then
   log "initializing /etc/libvirt"
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtconfig b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtconfig
index d09296f9ae..b588cf89b2 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtconfig
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtconfig
@@ -15,7 +15,8 @@
 $cfgfile = "/boot/config/domain.cfg";
 $cfg_defaults = [
   "SERVICE" => "disable",
-  "IMAGE_FILE" => "/mnt/user/system/libvirt/libvirt.img",
+  "IMAGE_FILE" => "/mnt/user/system/libvirt/",
+  "OLD_IMAGE_FILE" => "/mnt/user/system/libvirt/",
   "IMAGE_SIZE" => "1",
   "DEBUG" => "no",
   "DOMAINDIR" => "/mnt/user/domains/",
diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index 013220079e..e41bc61b61 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -173,7 +173,7 @@ version(){
 
 libvirtd_start(){
   log "Starting $DAEMON..."
-    if ! mountpoint /etc/libvirt &>/dev/null; then
+  if ! mountpoint /etc/libvirt &>/dev/null; then
     log "$DAEMON...  No image mounted at /etc/libvirt."
     exit 1
   elif [[ -f $LIBVIRTD_PIDFILE ]]; then

From 3ffebdfb6e5e40d5fda67330af76c76de05142b9 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:26:10 +0100
Subject: [PATCH 10/16] Update help text

---
 emhttp/languages/en_US/helptext.txt               | 12 ++++++++++--
 emhttp/plugins/dynamix.vm.manager/VMSettings.page |  5 ++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/emhttp/languages/en_US/helptext.txt b/emhttp/languages/en_US/helptext.txt
index b878ec9afa..b11c1c65b0 100644
--- a/emhttp/languages/en_US/helptext.txt
+++ b/emhttp/languages/en_US/helptext.txt
@@ -1618,7 +1618,11 @@ Stop VMs from Autostarting\Starting when VM Manager starts or open is run from t
 :end
 
 :vms_libvirt_volume_help:
-This is the libvirt volume.
+This is the libvirt volume/directory.
+:end
+
+:vms_libvirt_secondary_volume_help:
+This is a location for storing previous versions of xml and nvram at change.
 :end
 
 :vms_libvirt_vdisk_size_help:
@@ -1627,7 +1631,11 @@ To resize an existing image file, specify the new size here. Next time the Libvi
 :end
 
 :vms_libvirt_location_help:
-You must specify an image file for Libvirt. The system will automatically create this file when the Libvirt service is first started.
+You must specify an image file/directory for Libvirt. The system will automatically create this file/directory when the Libvirt service is first started.
+:end
+
+:vms_libvirt_secondary_location_help:
+This is a directory for storing previous versions of xml and nvram at change. Does not need to be specified.
 :end
 
 :vms_libvirt_storage_help:
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 1a5851576d..0abf50b3c9 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -123,7 +123,7 @@ _(Libvirt vdisk size)_:
 :vms_libvirt_vdisk_size_help:
 
 _(Libvirt storage location)_:
-: <input type="text" id="IMAGE_FILE" name="IMAGE_FILE" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
+: <input type="text" id="IMAGE_FILE" name="IMAGE_FILE" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>" placeholder="e.g. /mnt/user/system/libvirt/" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
  <?if (file_exists($domain_cfg['IMAGE_FILE'])):?><span id="deletePanel"><label><input type="checkbox" id="deleteCheckbox" /> _(Delete Image File)_</label></span><?endif;?>
  <?if (!$started):?><span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
  <?elseif (!is_dir(dirname($domain_cfg['IMAGE_FILE']))):?><span><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
@@ -132,9 +132,8 @@ _(Libvirt storage location)_:
 :vms_libvirt_location_help:
 
 _(Libvirt secondary storage location)_:
-: <input type="text" id="IMAGE_FILE_SECONDARY" name="IMAGE_FILE_SECONDARY" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE_SECONDARY']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
+: <input type="text" id="IMAGE_FILE_SECONDARY" name="IMAGE_FILE_SECONDARY" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE_SECONDARY']);?>" placeholder="e.g. /mnt/user/system/libvirt/" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
  <?if (!$started):?><span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
- <?elseif (!is_dir(dirname($domain_cfg['IMAGE_FILE_SECONDARY']))):?><span><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
  <?endif;?><span id="IMAGE_ERROR_SECONDARY" class="errortext"></span>
 
 :vms_libvirt_secondary_location_help:

From 7b033823528e74667aa009056f29c5e7a41d4bb2 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Tue, 6 May 2025 20:18:40 +0100
Subject: [PATCH 11/16] Remove secondary path.

---
 emhttp/plugins/dynamix.vm.manager/VMSettings.page | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index f00d792524..11bb44245f 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -169,13 +169,6 @@ _(Libvirt storage location)_:
 
 :vms_libvirt_location_help:
 
-_(Libvirt secondary storage location)_:
-: <input type="text" id="IMAGE_FILE_SECONDARY" name="IMAGE_FILE_SECONDARY" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE_SECONDARY']);?>" placeholder="e.g. /mnt/user/system/libvirt/" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
- <?if (!$started):?><span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
- <?endif;?><span id="IMAGE_ERROR_SECONDARY" class="errortext"></span>
-
-:vms_libvirt_secondary_location_help:
-
 <?endif;?>
 _(Default VM storage path)_:
 : <input type="text" id="domaindir" name="DOMAINDIR" autocomplete="off" spellcheck="false" data-pickfolders="true" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="/mnt" value="<?=htmlspecialchars($domain_cfg['DOMAINDIR'])?>" placeholder="_(Click to Select)_" pattern="^[^\\]*/$">

From fca221a93e3ad6013756708d9e131bfd4b47b90f Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Tue, 6 May 2025 20:21:12 +0100
Subject: [PATCH 12/16] Remove secondary code.

---
 emhttp/plugins/dynamix.vm.manager/VMSettings.page | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 11bb44245f..03c4235d43 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -146,12 +146,6 @@ _(Libvirt storage location)_:
 
 :vms_libvirt_volume_help:
 
-_(Libvirt secondary storage location)_:
-: <?=htmlspecialchars($domain_cfg['IMAGE_FILE_SECONDARY'])."Test"?>
-
-:vms_libvirt_secondary_volume_help:
-
-
 <?else: /* Libvirt is stopped */ ?>
 _(Libvirt vdisk size)_:
 : <input type="number" id="IMAGE_SIZE" name="IMAGE_SIZE" min="1" value="<?=htmlspecialchars($domain_cfg['IMAGE_SIZE']);?>" style="width:50px;" required="required" />_(GB)_ <span id="SIZE_ERROR" class="errortext"></span>
@@ -482,9 +476,6 @@ $(function(){
   $("#IMAGE_FILE").fileTreeAttach(null, null, function(folder) {
     $("#IMAGE_FILE").val(folder + 'libvirt.img').change();
   });
-  $("#IMAGE_FILE_SECONDARY").fileTreeAttach(null, null, function(folder) {
-    $("#IMAGE_FILE_SECONDARY").val(folder + 'libvirt.img').change();
-  });
   $('#domaindir').fileTreeAttach();
   $('#mediadir').fileTreeAttach();
   $('#winvirtio').fileTreeAttach();
@@ -508,7 +499,6 @@ $(function(){
       $("#SERVICE").prop("disabled", checked).val('disable');
       $("#IMAGE_SIZE").prop("disabled", checked);
       $("#IMAGE_FILE").prop("disabled", checked).val("<?=$domain_cfg['IMAGE_FILE']?>");
-      $("#IMAGE_FILE_SECONDARY").prop("disabled");
       $("#domaindir").prop("disabled", checked);
       $("#mediadir").prop("disabled", checked);
       $("#winvirtio_select").prop("disabled", checked);

From 72562977caea2b9cd28bf080018e5e0faaea98c7 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 7 Jan 2026 10:59:08 +0000
Subject: [PATCH 13/16] Create location file.

---
 .../dynamix.vm.manager/VMSettings.page        |   8 +-
 .../scripts/libvirtlocation                   | 137 ++++++++++++++++++
 etc/rc.d/rc.libvirt                           |   3 +
 3 files changed, 145 insertions(+), 3 deletions(-)
 create mode 100644 emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation

diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index ce191b0436..8ce9d5dee8 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -162,14 +162,15 @@ _(Libvirt storage location)_:
 
 :vms_libvirt_volume_help:
 
-<?else: /* Libvirt is stopped */ ?>
-_(Libvirt vdisk size)_ (_(GB)_):
+<?else : /* Libvirt is stopped */ ?>
+
+ _(Libvirt vdisk size)_ (_(GB)_):
 : <input type="number" id="IMAGE_SIZE" name="IMAGE_SIZE" min="1" value="<?=htmlspecialchars($domain_cfg['IMAGE_SIZE']);?>" required="required" /><span id="SIZE_ERROR" class="errortext"></span>
 
 :vms_libvirt_vdisk_size_help:
 
 _(Libvirt storage location)_:
-: <input type="text" id="IMAGE_FILE" name="IMAGE_FILE" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" required pattern="^[^\\]*libvirt\.img$">
+: <input type="text" id="IMAGE_FILE" name="IMAGE_FILE" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
 <?if (file_exists($domain_cfg['IMAGE_FILE'])):?>
   <span id="deletePanel"><label><input type="checkbox" id="deleteCheckbox" /> _(Delete Image File)_</label></span><?endif;?>
 <?if (!$started):?>
@@ -180,6 +181,7 @@ _(Libvirt storage location)_:
 :vms_libvirt_location_help:
 
 <?endif;?>
+
 _(Default VM storage path)_:
 : <input type="text" id="domaindir" name="DOMAINDIR" autocomplete="off" spellcheck="false" data-pickfolders="true" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="/mnt" value="<?=htmlspecialchars($domain_cfg['DOMAINDIR'])?>" placeholder="_(Click to Select)_" pattern="^[^\\]*/$" onchange="validatePath(this)">
 <?if (!$started):?>
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation
new file mode 100644
index 0000000000..e96897be22
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation
@@ -0,0 +1,137 @@
+#!/usr/bin/php 
+<?PHP
+/* Copyright 2015-2026, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+
+/* ---------------------------------------------------------
+ * Read default VM directory from Unraid domain.cfg
+ * --------------------------------------------------------- */
+function get_default_domain_dir() {
+    $cfg = '/boot/config/domain.cfg';
+
+    if (!file_exists($cfg)) {
+        return null;
+    }
+
+    $lines = file($cfg, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+    if ($lines === false) {
+        return null;
+    }
+
+    foreach ($lines as $line) {
+        $line = trim($line);
+
+        if ($line === '' || $line[0] === '#') {
+            continue;
+        }
+
+        if (preg_match('/^DOMAINDIR="([^"]+)"/', $line, $m)) {
+            return rtrim($m[1], '/');
+        }
+    }
+
+    return null;
+}
+
+/* ---------------------------------------------------------
+ * Connect to libvirt
+ * --------------------------------------------------------- */
+$lv = libvirt_connect('qemu:///system', false);
+if (!$lv) {
+    die("Failed to connect to libvirt\n");
+}
+
+/* Running VMs (or all, if you prefer libvirt_list_all_domains) */
+$domains = libvirt_list_domains($lv);
+if ($domains === false) {
+    die("Failed to list domains\n");
+}
+
+$default_domain_dir = get_default_domain_dir();
+
+$vms = [];
+
+/* ---------------------------------------------------------
+ * Enumerate VMs
+ * --------------------------------------------------------- */
+foreach ($domains as $dom) {
+
+    $domget = libvirt_domain_lookup_by_name($lv, $dom);
+    if ($domget === false) {
+        continue;
+    }
+
+    $xml = libvirt_domain_get_xml_desc($domget, 0);
+    if ($xml === false) {
+        continue;
+    }
+
+    $sx = new SimpleXMLElement($xml);
+
+    $vm_name = (string)$sx->name;
+    $uuid    = (string)$sx->uuid;
+
+    /* -----------------------------------------------------
+     * Read storage metadata (Unraid vmtemplate)
+     * ----------------------------------------------------- */
+    $metadata_storage = null;
+
+    if (isset($sx->metadata)) {
+        foreach ($sx->metadata->children() as $child) {
+            if ($child->getName() === 'vmtemplate') {
+                $metadata_storage = trim((string)$child['storage']);
+                break;
+            }
+        }
+    }
+
+    /* -----------------------------------------------------
+     * Resolve filesystem path
+     * Treat empty, null, or "default" as DOMAINDIR
+     * ----------------------------------------------------- */
+    if ($metadata_storage === null || $metadata_storage === '' || strtolower($metadata_storage) === 'default') {
+        /* TRUE default storage */
+        $path_root    = $default_domain_dir;   // e.g. /mnt/user/domains2
+        $storage_name = 'default';
+    } else {
+        /* Explicit Unraid pool */
+        $path_root    = '/mnt/user/' . $metadata_storage;
+        $storage_name = $metadata_storage;
+    }
+
+    /* Shell-safe path (VM name quoted) */
+    $path = $path_root
+        ? $path_root . '/"' . $vm_name . '"'
+        : null;
+
+    /* Filesystem existence check (remove quotes for is_dir) */
+    $exists = ($path_root && is_dir($path_root . '/' . $vm_name));
+
+    /* -----------------------------------------------------
+     * Store result
+     * ----------------------------------------------------- */
+    $vms[] = [
+        'name'    => $vm_name,
+        'uuid'    => $uuid,
+        'storage' => $storage_name,
+        'path'    => $path,
+        'exists'  => $exists,
+    ];
+}
+
+/* ---------------------------------------------------------
+ * Output
+ * --------------------------------------------------------- */
+#print_r($vms);
+
+file_put_contents("/boot/config/plugins/dynamix.vm.manager/vms.json",json_encode($vms,JSON_PRETTY_PRINT));
+?>
diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index ae1c88e7b7..06117661ef 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -247,6 +247,9 @@ libvirtd_start(){
 }
 
 libvirtd_stop(){
+  # Save VM locations
+  /usr/local/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation
+  #
   log "Stopping $DAEMON..."
   if [[ ! -f $LIBVIRTD_PIDFILE ]]; then
     log "$DAEMON...  Already stopped."

From 00ed5d2f2ebec8c864346ff97137d9c60c4a9235 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 7 Jan 2026 10:59:45 +0000
Subject: [PATCH 14/16] Make script executable

---
 emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation

diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation
old mode 100644
new mode 100755

From d13e6b202a0cf02a651582f79d839ed618f3fcb2 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 7 Jan 2026 14:11:27 +0000
Subject: [PATCH 15/16] XML movements

---
 .../scripts/{libvirtlocation => libvirtcopy}  | 21 +++++++++++---
 .../dynamix.vm.manager/scripts/libvirtrestore | 28 +++++++++++++++++++
 .../dynamix.vm.manager/scripts/savehook.php   | 12 ++++++++
 etc/rc.d/rc.libvirt                           |  2 +-
 4 files changed, 58 insertions(+), 5 deletions(-)
 rename emhttp/plugins/dynamix.vm.manager/scripts/{libvirtlocation => libvirtcopy} (84%)
 mode change 100755 => 100644
 create mode 100644 emhttp/plugins/dynamix.vm.manager/scripts/libvirtrestore
 create mode 100644 emhttp/plugins/dynamix.vm.manager/scripts/savehook.php

diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtcopy
old mode 100755
new mode 100644
similarity index 84%
rename from emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation
rename to emhttp/plugins/dynamix.vm.manager/scripts/libvirtcopy
index e96897be22..222ce20051
--- a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtcopy
@@ -108,22 +108,23 @@ foreach ($domains as $dom) {
         $storage_name = $metadata_storage;
     }
 
-    /* Shell-safe path (VM name quoted) */
+
     $path = $path_root
-        ? $path_root . '/"' . $vm_name . '"'
+        ? $path_root . '/' . $vm_name
         : null;
 
+
     /* Filesystem existence check (remove quotes for is_dir) */
     $exists = ($path_root && is_dir($path_root . '/' . $vm_name));
 
     /* -----------------------------------------------------
      * Store result
      * ----------------------------------------------------- */
-    $vms[] = [
-        'name'    => $vm_name,
+    $vms[$vm_name] = [
         'uuid'    => $uuid,
         'storage' => $storage_name,
         'path'    => $path,
+        'path_shell' => $path ? escapeshellarg($path) : null,
         'exists'  => $exists,
     ];
 }
@@ -134,4 +135,16 @@ foreach ($domains as $dom) {
 #print_r($vms);
 
 file_put_contents("/boot/config/plugins/dynamix.vm.manager/vms.json",json_encode($vms,JSON_PRETTY_PRINT));
+
+
+foreach ($vms as $vm => $vmdetail) {
+  file_put_contents("/tmp/Stopcopy","");
+  $from_file = "/etc/libvirt/qemu/$vm.xml";
+  $to_file = $vmdetail['path']."/$vm.xml";
+  #echo " from:$from_file     to:$to_file";
+  if ($vmdetail['exists']) {
+    file_put_contents("/tmp/Stopcopy","$vm from:$from_file     to:$to_file\n",FILE_APPEND);    #echo " from:$from_file     to:$to_file";
+    #copy($from_file,$to_file);
+  } else       file_put_contents("/tmp/Stopcopy","Nocpy $vm from:$from_file     to:$to_file\n",FILE_APPEND);    #echo " from:$from_file     to:$to_file";
+}
 ?>
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtrestore b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtrestore
new file mode 100644
index 0000000000..e153fc6bd5
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtrestore
@@ -0,0 +1,28 @@
+#!/usr/bin/php 
+<?PHP
+/* Copyright 2015-2026, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+
+$vmsjson = file_get_contents("/boot/config/plugins/dynamix.vm.manager/vms.json");
+$vms = json_decode($vmsjson,true);
+
+foreach ($vms as $vm => $vmdetail) {
+  file_put_contents("/tmp/Stopcopy","");
+  $to_file = "/etc/libvirt/qemu/$vm.xml";
+  $from_file = $vmdetail['path']."/$vm.xml";
+  #echo " from:$from_file     to:$to_file";
+  if (file_exists($from_file)) {
+    file_put_contents("/tmp/libvirtrestore","$vm from:$from_file     to:$to_file\n",FILE_APPEND);    #echo " from:$from_file     to:$to_file";
+    #copy($from_file,$to_file);
+  } else       file_put_contents("/tmp/libvirtrestore","Nocpy $vm from:$from_file     to:$to_file\n",FILE_APPEND);    #echo " from:$from_file     to:$to_file";
+}
+?>
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/savehook.php b/emhttp/plugins/dynamix.vm.manager/scripts/savehook.php
new file mode 100644
index 0000000000..f06e25279d
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/savehook.php
@@ -0,0 +1,12 @@
+#!/usr/bin/env php
+<?php
+$cfg = "/boot/config/plugins/dynamix.vm.manager/vms.json";
+$vms = json_decode(file_get_contents($cfg),true);
+if ($argv[2] == 'stopped'){
+    $vm = $argv[1];
+    $from_file = "/etc/libvirt/qemu/$vm.xml";
+    $to_file = $vms[$argv[1]]['path']."/$vm.xml";
+    #echo " from:$from_file     to:$to_file";
+    copy($from_file,$to_file);
+}
+?>
diff --git a/etc/rc.d/rc.libvirt b/etc/rc.d/rc.libvirt
index 06117661ef..a53c4d237e 100755
--- a/etc/rc.d/rc.libvirt
+++ b/etc/rc.d/rc.libvirt
@@ -248,7 +248,7 @@ libvirtd_start(){
 
 libvirtd_stop(){
   # Save VM locations
-  /usr/local/emhttp/plugins/dynamix.vm.manager/scripts/libvirtlocation
+  /usr/local/emhttp/plugins/dynamix.vm.manager/scripts/libvirtcopy
   #
   log "Stopping $DAEMON..."
   if [[ ! -f $LIBVIRTD_PIDFILE ]]; then

From a41622bd7c288a65d05e02c78102671549c62af2 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 7 Jan 2026 14:13:16 +0000
Subject: [PATCH 16/16] Make script executable

---
 emhttp/plugins/dynamix.vm.manager/scripts/libvirtcopy    | 0
 emhttp/plugins/dynamix.vm.manager/scripts/libvirtrestore | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 emhttp/plugins/dynamix.vm.manager/scripts/libvirtcopy
 mode change 100644 => 100755 emhttp/plugins/dynamix.vm.manager/scripts/libvirtrestore

diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtcopy b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtcopy
old mode 100644
new mode 100755
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/libvirtrestore b/emhttp/plugins/dynamix.vm.manager/scripts/libvirtrestore
old mode 100644
new mode 100755