Merge pull request #1172 from deeplow/1171-nopat-kernel-removal

Remove unecessary nopat kernelopt
freedomofpress · Sep 9, 2024 · 3ba7b54 · 3ba7b54
2 parents f493665 + 2d2a863
commit 3ba7b54
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/securedrop_salt/sd-sys-whonix-vms.sls b/securedrop_salt/sd-sys-whonix-vms.sls
@@ -25,7 +25,7 @@ dom0-enabled-apparmor-on-whonix-gw-template:
   qvm.vm:
     - name: whonix-gateway-{{ sd_supported_whonix_version }}
     - prefs:
-      - kernelopts: "nopat apparmor=1 security=apparmor"
+      - kernelopts: "apparmor=1 security=apparmor"
     - require:
       - sls: securedrop_salt.sd-upgrade-templates
       - qvm: whonix-gateway-installed
@@ -35,7 +35,7 @@ dom0-enabled-apparmor-on-whonix-ws-template:
   qvm.vm:
     - name: whonix-workstation-{{ sd_supported_whonix_version }}
     - prefs:
-      - kernelopts: "nopat apparmor=1 security=apparmor"
+      - kernelopts: "apparmor=1 security=apparmor"
     - require:
       - sls: securedrop_salt.sd-upgrade-templates
       - qvm: whonix-gateway-installed

diff --git a/securedrop_salt/sd-whonix.sls b/securedrop_salt/sd-whonix.sls
@@ -29,7 +29,7 @@ sd-whonix:
       - provides-network: true
       - netvm: "sys-firewall"
       - autostart: true
-      - kernelopts: "nopat apparmor=1 security=apparmor"
+      - kernelopts: "apparmor=1 security=apparmor"
       - default_dispvm: ""
     - tags:
       - add:

diff --git a/tests/test_vms_exist.py b/tests/test_vms_exist.py
@@ -90,7 +90,7 @@ def test_sd_whonix_config(self):
         vm = self.app.domains["sd-whonix"]
         nvm = vm.netvm
         self.assertEqual(nvm.name, "sys-firewall")
-        wanted_kernelopts = "nopat apparmor=1 security=apparmor"
+        wanted_kernelopts = "apparmor=1 security=apparmor"
         self.assertEqual(vm.kernelopts, wanted_kernelopts)
         self.assertEqual(vm.template, "whonix-gateway-17")
         self.assertTrue(vm.provides_network)