Detach devices from sd-export-usb before re-attaching

This will ensure that only 1 device is attached to the sd-export-usb domain.
freedomofpress · Jun 5, 2019 · dbe00eb · dbe00eb
1 parent efc1ede
commit dbe00eb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/dom0/sd-export.sls b/dom0/sd-export.sls
@@ -60,9 +60,13 @@ sd-export-create-named-dispvm:
 
 {% import_json "sd/config.json" as d %}
 
+# Persistent attachments can only be removed when the domain is off, so we must
+# kill sd-export-usb before detaching the USB devices from the domain
 sd-export-named-dispvm-permanently-attach-usb:
   cmd.run:
     - name: >
+        qvm-kill sd-export-usb || true ;
+        qvm-usb detach sd-export-usb || true ;
         qvm-usb attach --persistent sd-export-usb {{ d.usb.device }} || true
     - require:
       - cmd: sd-export-create-named-dispvm