From 9dade5c21976d870c6f670f119fc7c7c622defb9 Mon Sep 17 00:00:00 2001
From: Rusty Bird <rustybird@net-c.com>
Date: Tue, 16 Jan 2018 06:19:57 +0000
Subject: [PATCH] block-snapshot: remove R3.2 template commit code

qvm-template-commit does not exist in R4.0, where FileVolume.stop()
takes care of committing.
---
 linux/system-config/block-snapshot | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/linux/system-config/block-snapshot b/linux/system-config/block-snapshot
index a922989e..2ee4e4e0 100755
--- a/linux/system-config/block-snapshot
+++ b/linux/system-config/block-snapshot
@@ -158,12 +158,6 @@ case "$command" in
           echo "/dev/mapper/$dm_devname" > "$HOTPLUG_STORE-node"
           write_dev /dev/mapper/$dm_devname
         fi
-        # Save domain name for template commit on device remove
-        domid=$(xenstore_read "$XENBUS_PATH/frontend-id")
-        # Store name of target domain in case of stubdom
-        domid=$(xenstore_read_default "/local/domain/$domid/target" "$domid")
-        domain=$(xl domname $domid)
-        echo $domain > "$HOTPLUG_STORE-domain"
 
         release_lock "block"
         exit 0
@@ -286,18 +280,6 @@ case "$command" in
               dmsetup remove $snap
             fi
           done
-          if [ "$command" = "remove" ]; then
-            # Commit template changes
-            domain=$(cat "$HOTPLUG_STORE-domain")
-            if [ "$domain" ]; then
-              if [ -r /var/lib/qubes/qubes-test.xml -a \
-                  "${domain#test-}" != "$domain" ]; then
-                export QUBES_XML_PATH=/var/lib/qubes/qubes-test.xml
-              fi
-              # Dont stop on errors
-              /usr/bin/qvm-template-commit --offline-mode "$domain" || true
-            fi
-          fi
         fi
 
         if [ -e $node ]; then