Bump supported fedora version to 41

files/sdw-admin.py

@@ -105,11 +105,11 @@ def provision_and_configure():
 
     sync_appmenus()
 
-    if "sd-fedora-40-dvm" in Qubes().domains:
-        # If sd-fedora-40-dvm exists it's because salt determined that sys-usb was disposable
+    if "sd-fedora-41-dvm" in Qubes().domains:
+        # If sd-fedora-41-dvm exists it's because salt determined that sys-usb was disposable
         configure(
             "Add SecureDrop export device handling to sys-usb (disposable)",
-            ["sd-fedora-40-dvm"],
+            ["sd-fedora-41-dvm"],
             restart=["sys-usb"],
         )
     else:

sdw_updater/Updater.py

@@ -42,7 +42,7 @@
 # as well as their associated TemplateVMs.
 # In the future, we could use qvm-prefs to extract this information.
 current_vms = {
-    "fedora": "fedora-40-xfce",
+    "fedora": "fedora-41-xfce",
     "sd-viewer": f"sd-large-{DEBIAN_VERSION}-template",
     "sd-app": f"sd-small-{DEBIAN_VERSION}-template",
     "sd-log": f"sd-small-{DEBIAN_VERSION}-template",

securedrop_salt/sd-clean-all.sls

@@ -35,11 +35,11 @@ restore-sys-usb-dispvm-start:
     - require:
       - qvm: restore-sys-usb-dispvm
 
-# autoattach modifications are only present in sd-fedora-40-dvm
+# autoattach modifications are only present in sd-fedora-41-dvm
 # so no more sd-usb-autoattach-remove necessary
 remove-sd-fedora-dispvm:
   qvm.absent:
-    - name: sd-fedora-40-dvm
+    - name: sd-fedora-41-dvm
     - require:
       - qvm: restore-sys-usb-dispvm
 {% else %}

securedrop_salt/sd-sys-vms.sls

@@ -11,7 +11,7 @@ include:
 
 # 4.2 fedora template is fedora-NN-xfce, but let's keep the dvm names to 
 # follow simple - like sd-fedora-NN-dvm
-{% set sd_supported_fedora_version = 'fedora-40' %}
+{% set sd_supported_fedora_version = 'fedora-41' %}
 {% set sd_fedora_base_template = sd_supported_fedora_version + '-xfce' %}
 
 # Install latest templates required for SDW VMs.
@@ -123,9 +123,9 @@ sd-{{ sys_vm }}-fedora-version-update:
 # the template, in case it's being used elsewhere, but the `sd-` VMs we can
 # reasonably manage (remove) ourselves.
 {% if sys_vm == "sys-usb" %}
-remove-sd-fedora-39-dvm:
+remove-sd-fedora-40-dvm:
   qvm.absent:
-    - name: sd-fedora-39-dvm
+    - name: sd-fedora-40-dvm
     - require:
       - qvm: sd-sys-usb-fedora-version-update
 {% endif %}

securedrop_salt/sd-workstation.top

@@ -30,7 +30,7 @@ base:
     - securedrop_salt.sd-viewer-files
   sd-gpg:
     - securedrop_salt.sd-gpg-files
-  'sd-fedora-40-dvm,sys-usb':
+  'sd-fedora-41-dvm,sys-usb':
     - match: list
     - securedrop_salt.sd-usb-autoattach-add
   whonix-gateway-17:

tests/base.py

@@ -15,7 +15,7 @@
 SD_DVM_TEMPLATES = ["sd-devices-dvm", "sd-proxy-dvm"]
 SD_TEMPLATES = [SD_TEMPLATE_BASE, SD_TEMPLATE_LARGE, SD_TEMPLATE_SMALL]
 
-CURRENT_FEDORA_VERSION = "40"
+CURRENT_FEDORA_VERSION = "41"
 CURRENT_FEDORA_TEMPLATE = "fedora-" + CURRENT_FEDORA_VERSION + "-xfce"
 CURRENT_FEDORA_DVM = "fedora-" + CURRENT_FEDORA_VERSION + "-dvm"
 CURRENT_WHONIX_VERSION = "17"