From e8734813c46bcf6f74a7cff253e2dc8411e29503 Mon Sep 17 00:00:00 2001
From: Kevin O Gorman <kog@freedom.press>
Date: Thu, 16 Nov 2023 16:29:04 -0500
Subject: [PATCH] update expected fedora base template name

---
 dom0/sd-sys-vms.sls | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/dom0/sd-sys-vms.sls b/dom0/sd-sys-vms.sls
index 0af1037a..7d6ec9e1 100644
--- a/dom0/sd-sys-vms.sls
+++ b/dom0/sd-sys-vms.sls
@@ -9,21 +9,23 @@ include:
   # DispVM is created
   - qvm.default-dispvm
 
+# 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-38' %}
-
+{% set sd_fedora_base_template = sd_supported_fedora_version + '-xfce' %}
 
 # Install latest templates required for SDW VMs.
 dom0-install-fedora-template:
   cmd.run:
     - name: >
-        qvm-template info --machine-readable {{ sd_supported_fedora_version }} | grep -q "installed|{{ sd_supported_fedora_version }}|" || qvm-template install {{ sd_supported_fedora_version }}
+        qvm-template info --machine-readable {{ sd_supported_fedora_version }} | grep -q "installed|{{ sd_fedora_base_template }}|" || qvm-template install {{ sd_fedora_base_template }}
 
 # Update the mgmt VM before updating the new Fedora VM. The order is required
 set-fedora-template-as-default-mgmt-dvm:
   cmd.run:
     - name: >
         qvm-shutdown --wait default-mgmt-dvm &&
-        qvm-prefs default-mgmt-dvm template {{ sd_supported_fedora_version }}
+        qvm-prefs default-mgmt-dvm template {{ sd_fedora_base_template }}
     - require:
       - cmd: dom0-install-fedora-template
 
@@ -32,7 +34,7 @@ set-fedora-template-as-default-mgmt-dvm:
 # is sets the default_dispvm to the DispVM based on the wanted Fedora version.
 set-fedora-default-template-version:
   cmd.run:
-    - name: qubes-prefs default_template {{ sd_supported_fedora_version }}
+    - name: qubes-prefs default_template {{ sd_fedora_base_template }}
     - require:
       - cmd: dom0-install-fedora-template
       - sls: qvm.default-dispvm
@@ -44,6 +46,7 @@ set-fedora-default-template-version:
 # sys-usb is also disposable by default but a special case as we want to
 # customize the underlying DispVM template for usability purposes: we want to
 # consistently auto-attach USB devices to our sd-devices qube
+#
 {% set required_dispvms = [ sd_supported_fedora_version + '-dvm' ] %}
 {% if salt['pillar.get']('qvm:sys-usb:disposable', true) %}
   {% set _ = required_dispvms.append("sd-" + sd_supported_fedora_version + "-dvm") %}
@@ -54,10 +57,10 @@ create-{{ required_dispvm }}:
   qvm.vm:
     - name: {{ required_dispvm }}
     - present:
-      - template: {{ sd_supported_fedora_version }}
+      - template: {{ sd_fedora_base_template }}
       - label: red
     - prefs:
-      - template: {{ sd_supported_fedora_version }}
+      - template: {{ sd_fedora_base_template }}
       - template_for_dispvms: True
 {% if required_dispvm == 'sd-' + sd_supported_fedora_version + '-dvm' %}
       - netvm: ""
@@ -79,7 +82,7 @@ create-{{ required_dispvm }}:
     {% set sd_supported_fedora_template = sd_supported_fedora_version + '-dvm' %}
   {% endif %}
 {% else %}
-  {% set sd_supported_fedora_template = sd_supported_fedora_version %}
+  {% set sd_supported_fedora_template = sd_fedora_base_template %}
 {% endif %}
 {% if salt['cmd.shell']('qvm-prefs ' + sys_vm + ' template') != sd_supported_fedora_template %}
 sd-{{ sys_vm }}-fedora-version-halt: