Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sd-export-config.json in sd-export VMs #305

Merged
merged 2 commits into from
Aug 8, 2019
Merged

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Aug 2, 2019

Towards #281

This will allow sd-export to know what the dedicated USB device is for the export VM to facilitate preflight checks. This is required for the securedrop-export script to be able to know what the usb device configuration is. This is required for the USB preflight check, to check if a device is connected or not.

Test plan

  • make sd-export completes without error
  • make test completes without error
  • observe the configuration is populated in sd-export-usb (example below)
user@sd-export-usb:~$ cat /etc/sd-export-config.json 
{
  "pci_bus_id": "2",
  "usb_device": "4"
}

This will allow sd-export to know what the dedicated USB device is for the export VM to facilitate preflight checks.
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • make sd-export completes without error
  • make test completes without error
  • observe the configuration is populated in sd-export-usb

Works as advertised!

@conorsch conorsch merged commit 92d0006 into master Aug 8, 2019
@conorsch conorsch deleted the 281-preflight-checks branch August 8, 2019 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants