Skip to content

Commit

Permalink
Friendlier output on make clean action
Browse files Browse the repository at this point in the history
The force-removal commands for VMs and dom0 RPMs were emitting stderr
messages that could be construed by developers as genuine errors in the
clean process, rather than expected output while ensuring absent state.
Updated the makefile targets for removing the sd-export-usb VM and the
dom0 salt config RPM to silence stderr.
  • Loading branch information
Conor Schaefer committed Jul 24, 2019
1 parent 503fd6f commit 41fe988
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ remove-sd-export: assert-dom0 detach-sd-export-usb ## Destroys SD EXPORT VMs
@./scripts/destroy-vm sd-export-usb-dvm

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
@qvm-kill sd-export-usb 2>/dev/null || true
@qvm-usb detach sd-export-usb 2>/dev/null || 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 dnf -y -q remove securedrop-workstation-dom0-config 2>/dev/null || true
sudo rm -f /usr/bin/securedrop-update \
/etc/cron.daily/securedrop-update-cron

Expand Down

0 comments on commit 41fe988

Please sign in to comment.