From 8eab331cfc12a5465db1f35e7a617ec0b15279df Mon Sep 17 00:00:00 2001
From: Conor Schaefer <conor@freedom.press>
Date: Wed, 5 Sep 2018 20:38:23 -0400
Subject: [PATCH] Workaround for Salt config against Whonix

Partial progress toward #134. Doesn't resolve, but at least gets the
tests passing on sd-journalist again. Still struggling to get all tests
passing against sd-whonix.
---
 dom0/sd-journalist.sls | 4 ++++
 dom0/sd-whonix.sls     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/dom0/sd-journalist.sls b/dom0/sd-journalist.sls
index b6b2f8ee..f771256c 100644
--- a/dom0/sd-journalist.sls
+++ b/dom0/sd-journalist.sls
@@ -36,6 +36,10 @@ require:
     - group: root
     - mode: 644
 
+# Temporary workaround to bootstrap Salt support on target.
+qvm-run -a whonix-ws-14 "sudo apt-get install -qq python-futures":
+  cmd.run
+
 # Allow sd-journslist to open files in sd-decrypt
 # When our Qubes bug is fixed, this will *not* be used
 sed -i '1isd-journalist sd-decrypt allow' /etc/qubes-rpc/policy/qubes.OpenInVM:
diff --git a/dom0/sd-whonix.sls b/dom0/sd-whonix.sls
index 3de9dff8..113de0f4 100644
--- a/dom0/sd-whonix.sls
+++ b/dom0/sd-whonix.sls
@@ -31,3 +31,7 @@ require:
 {%- endload %}
 
 {{ load(defaults) }}
+
+# Temporary workaround to bootstrap Salt support on target.
+qvm-run -a whonix-gw-14 "sudo apt-get install -qq python-futures":
+  cmd.run