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

qubes-anaconda-addon: use qvm-default-dispvm state

Browse Source 
Migrate settings up fedora-25-dvm to salt state, same as for other VMs

QubesOS/qubes-issues#2975
This commit is contained in:
Marek Marczykowski-Górecki 2017-08-09 04:20:46 +02:00
parent fabc05e58e
commit 48c6983b29
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,8 +236,8 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
def __init_qubes_choices(self):
self.choice_network = QubesChoice(
_('Create default system qubes (sys-net, sys-firewall)'),
('qvm.sys-net', 'qvm.sys-firewall'))
_('Create default system qubes (sys-net, sys-firewall, default DispVM)'),
('qvm.sys-net', 'qvm.sys-firewall', 'qvm.default-dispvm'))
self.choice_default = QubesChoice(
_('Create default application qubes '
@ -538,9 +538,6 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
self.set_stage("Creating default DisposableVM")
dispvm_name = self.default_template + '-dvm'
self.run_command(['/usr/bin/qvm-create', '--label', 'red', dispvm_name])
self.run_command(['/usr/bin/qvm-prefs', dispvm_name, 'dispvm_allowed', 'True'])
self.run_command(['/usr/bin/qvm-features', dispvm_name, 'internal', 'True'])
self.run_command(['/usr/bin/qubes-prefs', 'default-dispvm',
dispvm_name])