QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

conf, qubes-anaconda-addon: switch templates to fedora-26 and debian-9

Browse Source 
(cherry picked from commit a1cda1d705)
This commit is contained in:
awokd 2017-12-24 00:04:18 -07:00 committed by Marek Marczykowski-Górecki
parent 3b4a02cc26
commit ad159228e9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf/comps-qubes.xml
View File

@ -1398,7 +1398,7 @@
<packagereq type="mandatory">qubes-gui-dom0</packagereq> <packagereq type="mandatory">qubes-gui-dom0</packagereq>
<packagereq type="mandatory">qubes-desktop-linux-manager</packagereq> <packagereq type="mandatory">qubes-desktop-linux-manager</packagereq>
<packagereq type="mandatory">qubes-mgmt-salt-dom0</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-gpg-split-dom0</packagereq>
<packagereq type="default">qubes-img-converter-dom0</packagereq> <packagereq type="default">qubes-img-converter-dom0</packagereq>
<packagereq type="default">qubes-input-proxy</packagereq> <packagereq type="default">qubes-input-proxy</packagereq>
@ -1409,13 +1409,13 @@
</group> </group>
<group> <group>
<id>debian-8</id> <id>debian</id>
<name>Debian 8 (jessie) template</name> <name>Debian 9 (stretch) template</name>
<description>Debian 8 (jessie) template</description> <description>Debian 9 (stretch) template</description>
<default>true</default> <default>true</default>
<uservisible>true</uservisible> <uservisible>true</uservisible>
<packagelist> <packagelist>
<packagereq>qubes-template-debian-8</packagereq> <packagereq>qubes-template-debian-9</packagereq>
</packagelist> </packagelist>
</group> </group>
@ -1448,7 +1448,7 @@
<groupid>xfce-media</groupid> <groupid>xfce-media</groupid>
</grouplist> </grouplist>
<optionlist> <optionlist>
<groupid default='true'>debian-8</groupid> <groupid default='true'>debian</groupid>
<groupid default='true'>whonix</groupid> <groupid default='true'>whonix</groupid>
</optionlist> </optionlist>
</environment> </environment>

2
conf/qubes-kickstart.cfg
View File

@ -21,6 +21,6 @@ repo --name=dom0-updates --baseurl=file:///tmp/qubes-installer/yum/dom0-updates/
@hardware-support @hardware-support
@qubes @qubes
@anaconda-tools @anaconda-tools
@debian-8 @debian
@whonix @whonix
%end %end

2
qubes-anaconda-addon/firstboot-qubes-text
View File

@ -104,7 +104,7 @@ if [ "$vms_template" == "yes" ]; then
qvm-shutdown --wait $template qvm-shutdown --wait $template
done done
qubes-prefs --set default-template 'fedora-23' qubes-prefs --set default-template 'fedora-26'
fi fi
if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then

2
qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
View File

@ -227,7 +227,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
self.qubes_user = None self.qubes_user = None
self.qubes_gid = None self.qubes_gid = None
self.default_template = 'fedora-25' self.default_template = 'fedora-26'
self.set_stage("Start-up") self.set_stage("Start-up")
self.done = False self.done = False