Removes duplicate rpm config from sys-firewall

The redundant config wasn't doing any harm in Qubes 4.0, but in Qubes 4.1, where sys-firewall is disposable by default, the tests were failing because the expected files were not in place. Closes #702.
freedomofpress · Mar 30, 2022 · 4ba57fa · 4ba57fa
1 parent 5ada6d2
commit 4ba57fa
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 71 deletions.
diff --git a/dom0/sd-sys-firewall-files.sls b/dom0/sd-sys-firewall-files.sls
diff --git a/dom0/sd-workstation.top b/dom0/sd-workstation.top
@@ -36,8 +36,6 @@ base:
   sd-app:
     - sd-app-config
     - sd-mime-handling
-  sys-firewall:
-    - sd-sys-firewall-files
   sd-whonix:
     - sd-whonix-hidserv-key
   securedrop-workstation-buster:

diff --git a/scripts/provision-all b/scripts/provision-all
@@ -11,7 +11,6 @@ max_concurrency="2"
 
 echo "Configure Fedora-based system VMs"
 sudo qubesctl --show-output state.sls sd-sys-vms
-sudo qubesctl --show-output --skip-dom0 --targets sys-firewall state.sls sd-sys-firewall-files
 
 # Running only against dom0, to ensure the VMs are created (but not yet configured)
 echo "Set up dom0 config files, including RPC policies, and create VMs"

diff --git a/tests/test_sys_firewall.py b/tests/test_sys_firewall.py