Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

app: define values for default_dispvm=None, updatevm=None

Browse Source 
If those VMs are not set, default to None, instead of throwing
AttributeError.

Fixes QubesOS/qubes-issues#3475
This commit is contained in:
Marek Marczykowski-Górecki 2018-01-19 04:50:04 +01:00
parent 206d3f136d
commit 91639d7933
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qubes/app.py
View File

@ -729,7 +729,7 @@ class Qubes(qubes.PropertyHolder):
vmclass=qubes.vm.templatevm.TemplateVM, vmclass=qubes.vm.templatevm.TemplateVM,
doc='Default template for new AppVMs') doc='Default template for new AppVMs')
updatevm = qubes.VMProperty('updatevm', load_stage=3, updatevm = qubes.VMProperty('updatevm', load_stage=3,
allow_none=True, default=None, allow_none=True,
doc='''Which VM to use as `yum` proxy for updating AdminVM and doc='''Which VM to use as `yum` proxy for updating AdminVM and
TemplateVMs''') TemplateVMs''')
clockvm = qubes.VMProperty('clockvm', load_stage=3, clockvm = qubes.VMProperty('clockvm', load_stage=3,
@ -738,6 +738,7 @@ class Qubes(qubes.PropertyHolder):
default_kernel = qubes.property('default_kernel', load_stage=3, default_kernel = qubes.property('default_kernel', load_stage=3,
doc='Which kernel to use when not overriden in VM') doc='Which kernel to use when not overriden in VM')
default_dispvm = qubes.VMProperty('default_dispvm', load_stage=3, default_dispvm = qubes.VMProperty('default_dispvm', load_stage=3,
default=None,
doc='Default DispVM base for service calls', allow_none=True) doc='Default DispVM base for service calls', allow_none=True)
default_pool = qubes.property('default_pool', load_stage=3, default_pool = qubes.property('default_pool', load_stage=3,