Fix clean for sd-export

clean makefile target will now force remove the usb device from sd-export-usb and delete VMs in order. sd-export-dvm should be removed *after* sd-export-usb, as the former is the DispVM template for the latter. sd-export-dvm will no longer persist after a make clean

Makefile

@@ -84,13 +84,15 @@ remove-sd-svs: assert-dom0 ## Destroys SD SVS VM
 remove-sd-gpg: assert-dom0 ## Destroys SD GPG keystore VM
 	@./scripts/destroy-vm sd-gpg
 
-remove-sd-export: assert-dom0 ## Destroys SD EXPORT VMs
-	@qvm-kill sd-export-usb || true
-	@qvm-usb detach sd-export-usb || true
+remove-sd-export: assert-dom0 detach-sd-export-usb ## Destroys SD EXPORT VMs
 	@./scripts/destroy-vm sd-export-usb
 	@./scripts/destroy-vm sd-export-usb-dvm
 
-clean: assert-dom0 destroy-all clean-salt ## Destroys all SD VMs
+detach-sd-export-usb: assert-dom0 ## Detach USB device from SD EXPORT USB VM
+	@qvm-kill sd-export-usb || true
+	@qvm-usb detach sd-export-usb || true
+
+clean: assert-dom0 detach-sd-export-usb destroy-all clean-salt ## Destroys all SD VMs
 	sudo dnf -y -q remove securedrop-workstation-dom0-config || true
 	sudo rm -f /usr/bin/securedrop-update \
 		/etc/cron.daily/securedrop-update-cron

scripts/list-vms

@@ -18,8 +18,8 @@ declare -a sd_workstation_vm_names=(
   sd-whonix
   sd-svs-disp
   sd-svs-disp-template
-  sd-export-usb-dvm
   sd-export-usb
+  sd-export-usb-dvm
   sd-export-template
 )