From 566d9d2b47bee436deaa546535b184ffe00bb2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 14 Dec 2024 18:40:28 +0100
Subject: [PATCH] Switch to fedora-41-xfce template for sys-gui and friends

QubesOS/qubes-issues#9244
---
 qvm/sys-audio.sls   | 2 +-
 qvm/sys-audio.top   | 2 +-
 qvm/sys-gui-gpu.sls | 4 ++--
 qvm/sys-gui-gpu.top | 2 +-
 qvm/sys-gui-vnc.sls | 4 ++--
 qvm/sys-gui-vnc.top | 2 +-
 qvm/sys-gui.sls     | 4 ++--
 qvm/sys-gui.top     | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/qvm/sys-audio.sls b/qvm/sys-audio.sls
index a864788..fcb7e32 100644
--- a/qvm/sys-audio.sls
+++ b/qvm/sys-audio.sls
@@ -23,7 +23,7 @@ prefs:
   - autostart: true
   - pci_strictreset: false
   - pcidevs:   {{ salt['grains.get']('pci_audio_devs', [])|yaml }}
-  - template:  {{ salt['pillar.get']('qvm:sys-audio:template', 'fedora-40-xfce') }}
+  - template:  {{ salt['pillar.get']('qvm:sys-audio:template', 'fedora-41-xfce') }}
 service:
   - enable:
     - audiovm
diff --git a/qvm/sys-audio.top b/qvm/sys-audio.top
index 1e8caab..0d88740 100644
--- a/qvm/sys-audio.top
+++ b/qvm/sys-audio.top
@@ -22,7 +22,7 @@ base:
   dom0:
     - match: nodegroup
     - qvm.sys-audio
-  {{ salt['pillar.get']('qvm:sys-audio:template', 'fedora-40-xfce') }}:
+  {{ salt['pillar.get']('qvm:sys-audio:template', 'fedora-41-xfce') }}:
     - qvm.sys-audio-template
   {{ vmname }}:
     - qvm.sys-audio-vm
diff --git a/qvm/sys-gui-gpu.sls b/qvm/sys-gui-gpu.sls
index bb668f0..c46beb8 100644
--- a/qvm/sys-gui-gpu.sls
+++ b/qvm/sys-gui-gpu.sls
@@ -8,7 +8,7 @@
 
 sys-gui-gpu-template:
   qvm.template_installed:
-    - name: {{ salt['pillar.get']('qvm:sys-gui-gpu:template', 'fedora-40-xfce') }}
+    - name: {{ salt['pillar.get']('qvm:sys-gui-gpu:template', 'fedora-41-xfce') }}
 
 sys-gui-gpu-installed:
   pkg.installed:
@@ -26,7 +26,7 @@ name:          sys-gui-gpu
 present:
   - label:     black
   - maxmem:    4000
-  - template:  {{ salt['pillar.get']('qvm:sys-gui-gpu:template', 'fedora-40-xfce') }}
+  - template:  {{ salt['pillar.get']('qvm:sys-gui-gpu:template', 'fedora-41-xfce') }}
 prefs:
   - virt_mode: hvm
   - netvm:     ""
diff --git a/qvm/sys-gui-gpu.top b/qvm/sys-gui-gpu.top
index aa50106..a1874a4 100644
--- a/qvm/sys-gui-gpu.top
+++ b/qvm/sys-gui-gpu.top
@@ -16,7 +16,7 @@ base:
   dom0:
     - match: nodegroup
     - qvm.sys-gui-gpu
-  {{ salt['pillar.get']('qvm:sys-gui:template', 'fedora-40-xfce') }}:
+  {{ salt['pillar.get']('qvm:sys-gui:template', 'fedora-41-xfce') }}:
     - qvm.sys-gui-template
   sys-gui-gpu:
     - qvm.sys-gui-vm
diff --git a/qvm/sys-gui-vnc.sls b/qvm/sys-gui-vnc.sls
index 50084b9..3beea43 100644
--- a/qvm/sys-gui-vnc.sls
+++ b/qvm/sys-gui-vnc.sls
@@ -6,7 +6,7 @@
 # ===============
 ##
 
-{{ salt['pillar.get']('qvm:sys-gui-vnc:template', 'fedora-40-xfce') }}:
+{{ salt['pillar.get']('qvm:sys-gui-vnc:template', 'fedora-41-xfce') }}:
   qvm.template_installed: []
 
 {% if 'psu' in salt['pillar.get']('qvm:sys-gui-vnc:dummy-modules', []) or 'backlight' in salt['pillar.get']('qvm:sys-gui-vnc:dummy-modules', []) %}
@@ -29,7 +29,7 @@ name:          sys-gui-vnc
 present:
   - label:     black
   - maxmem:    4000
-  - template:  {{ salt['pillar.get']('qvm:sys-gui-vnc:template', 'fedora-40-xfce') }}
+  - template:  {{ salt['pillar.get']('qvm:sys-gui-vnc:template', 'fedora-41-xfce') }}
 prefs:
   - netvm:     ""
   - guivm:     dom0
diff --git a/qvm/sys-gui-vnc.top b/qvm/sys-gui-vnc.top
index 40ea8ef..dfbfbeb 100644
--- a/qvm/sys-gui-vnc.top
+++ b/qvm/sys-gui-vnc.top
@@ -16,7 +16,7 @@ base:
   dom0:
     - match: nodegroup
     - qvm.sys-gui-vnc
-  {{ salt['pillar.get']('qvm:sys-gui-vnc:template', 'fedora-40-xfce') }}:
+  {{ salt['pillar.get']('qvm:sys-gui-vnc:template', 'fedora-41-xfce') }}:
     - qvm.sys-gui-template
   sys-gui-vnc:
     - qvm.sys-gui-vm
diff --git a/qvm/sys-gui.sls b/qvm/sys-gui.sls
index d53ae0c..be6c0da 100644
--- a/qvm/sys-gui.sls
+++ b/qvm/sys-gui.sls
@@ -6,7 +6,7 @@
 # ===========
 ##
 
-{{ salt['pillar.get']('qvm:sys-gui:template', 'fedora-40-xfce') }}:
+{{ salt['pillar.get']('qvm:sys-gui:template', 'fedora-41-xfce') }}:
   qvm.template_installed: []
 
 {% if 'psu' in salt['pillar.get']('qvm:sys-gui:dummy-modules', []) or 'backlight' in salt['pillar.get']('qvm:sys-gui:dummy-modules', []) %}
@@ -29,7 +29,7 @@ name:          sys-gui
 present:
   - label:     black
   - maxmem:    4000
-  - template:  {{ salt['pillar.get']('qvm:sys-gui:template', 'fedora-40-xfce') }}
+  - template:  {{ salt['pillar.get']('qvm:sys-gui:template', 'fedora-41-xfce') }}
 prefs:
   - netvm:     ""
   - guivm:     dom0
diff --git a/qvm/sys-gui.top b/qvm/sys-gui.top
index dc34634..c34f31f 100644
--- a/qvm/sys-gui.top
+++ b/qvm/sys-gui.top
@@ -16,7 +16,7 @@ base:
   dom0:
     - match: nodegroup
     - qvm.sys-gui
-  {{ salt['pillar.get']('qvm:sys-gui:template', 'fedora-40-xfce') }}:
+  {{ salt['pillar.get']('qvm:sys-gui:template', 'fedora-41-xfce') }}:
     - qvm.sys-gui-template
   sys-gui:
     - qvm.sys-gui-vm