From ad159228e925b8f6151b7b471d98e714e0c0ac36 Mon Sep 17 00:00:00 2001
From: awokd <awokd@danwin1210.me>
Date: Sun, 24 Dec 2017 00:04:18 -0700
Subject: [PATCH] conf, qubes-anaconda-addon: switch templates to fedora-26 and
 debian-9

(cherry picked from commit a1cda1d705973d52dda1095054f43232d7ca5147)
---
 conf/comps-qubes.xml                                 | 12 ++++++------
 conf/qubes-kickstart.cfg                             |  2 +-
 qubes-anaconda-addon/firstboot-qubes-text            |  2 +-
 .../gui/spokes/qubes_os.py                           |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 5e8a888..c256dfa 100644
--- a/conf/comps-qubes.xml
+++ b/conf/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-25</packagereq>
+      <packagereq type="mandatory">qubes-template-fedora-26</packagereq>
       <packagereq type="default">qubes-gpg-split-dom0</packagereq>
       <packagereq type="default">qubes-img-converter-dom0</packagereq>
       <packagereq type="default">qubes-input-proxy</packagereq>
@@ -1409,13 +1409,13 @@
   </group>
 
   <group>
-    <id>debian-8</id>
-    <name>Debian 8 (jessie) template</name>
-    <description>Debian 8 (jessie) template</description>
+    <id>debian</id>
+    <name>Debian 9 (stretch) template</name>
+    <description>Debian 9 (stretch) template</description>
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq>qubes-template-debian-8</packagereq>
+      <packagereq>qubes-template-debian-9</packagereq>
     </packagelist>
   </group>
 
@@ -1448,7 +1448,7 @@
      <groupid>xfce-media</groupid>
     </grouplist>
     <optionlist>
-     <groupid default='true'>debian-8</groupid>
+     <groupid default='true'>debian</groupid>
      <groupid default='true'>whonix</groupid>
     </optionlist>
   </environment>
diff --git a/conf/qubes-kickstart.cfg b/conf/qubes-kickstart.cfg
index e939776..b58b762 100644
--- a/conf/qubes-kickstart.cfg
+++ b/conf/qubes-kickstart.cfg
@@ -21,6 +21,6 @@ repo --name=dom0-updates --baseurl=file:///tmp/qubes-installer/yum/dom0-updates/
 @hardware-support
 @qubes
 @anaconda-tools
-@debian-8
+@debian
 @whonix
 %end
diff --git a/qubes-anaconda-addon/firstboot-qubes-text b/qubes-anaconda-addon/firstboot-qubes-text
index 676a6dd..2618d84 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-23'
+    qubes-prefs --set default-template 'fedora-26'
 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 2b968d0..1aac71c 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
@@ -227,7 +227,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
 
         self.qubes_user = None
         self.qubes_gid = None
-        self.default_template = 'fedora-25'
+        self.default_template = 'fedora-26'
 
         self.set_stage("Start-up")
         self.done = False