From 2c79b96c406c6296d2a509c8218b10627f4810c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 13 Jul 2018 17:28:46 +0200
Subject: [PATCH] qubes-anaconda-addon, conf: update to Fedora 28 template

QubesOS/qubes-issues#4013
---
 qubes-anaconda-addon/firstboot-qubes-text                       | 2 +-
 .../org_qubes_os_initial_setup/gui/spokes/qubes_os.py           | 2 +-
 qubes-release/comps-qubes.xml                                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qubes-anaconda-addon/firstboot-qubes-text b/qubes-anaconda-addon/firstboot-qubes-text
index 2618d84..2b4ccc8 100755
--- a/qubes-anaconda-addon/firstboot-qubes-text
+++ b/qubes-anaconda-addon/firstboot-qubes-text
@@ -104,7 +104,7 @@ if [ "$vms_template" == "yes" ]; then
         qvm-shutdown --wait $template
     done
 
-    qubes-prefs --set default-template 'fedora-26'
+    qubes-prefs --set default-template 'fedora-28'
 fi
 
 if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then
diff --git a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
index 68668d8..f545067 100644
--- a/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
+++ b/qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
@@ -228,7 +228,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
 
         self.qubes_user = None
         self.qubes_gid = None
-        self.default_template = 'fedora-26'
+        self.default_template = 'fedora-28'
 
         self.set_stage("Start-up")
         self.done = False
diff --git a/qubes-release/comps-qubes.xml b/qubes-release/comps-qubes.xml
index c256dfa..9acdaf5 100644
--- a/qubes-release/comps-qubes.xml
+++ b/qubes-release/comps-qubes.xml
@@ -1398,7 +1398,7 @@
       <packagereq type="mandatory">qubes-gui-dom0</packagereq>
       <packagereq type="mandatory">qubes-desktop-linux-manager</packagereq>
       <packagereq type="mandatory">qubes-mgmt-salt-dom0</packagereq>
-      <packagereq type="mandatory">qubes-template-fedora-26</packagereq>
+      <packagereq type="mandatory">qubes-template-fedora-28</packagereq>
       <packagereq type="default">qubes-gpg-split-dom0</packagereq>
       <packagereq type="default">qubes-img-converter-dom0</packagereq>
       <packagereq type="default">qubes-input-proxy</packagereq>