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

core: remove kernel properties from DispVM and Dom0 (#948)

Browse Source 
Qubes does not keep track of those kernel versions.

Conflicts:
	core-modules/01QubesDisposableVm.py
This commit is contained in:
Marek Marczykowski-Górecki 2015-01-26 01:58:32 +01:00
parent 2f7b3adeec
commit 72cf3a8201
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core-modules/006QubesAdminVm.py
View File

@ -32,6 +32,15 @@ class QubesAdminVm(QubesNetVm):
# In which order load this VM type from qubes.xml # In which order load this VM type from qubes.xml
load_order = 10 load_order = 10
def get_attrs_config(self):
attrs = super(QubesAdminVm, self).get_attrs_config()
attrs.pop('kernel')
attrs.pop('kernels_dir')
attrs.pop('kernelopts')
attrs.pop('uses_default_kernel')
attrs.pop('uses_default_kernelopts')
return attrs
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(QubesAdminVm, self).__init__(qid=0, name="dom0", netid=0, super(QubesAdminVm, self).__init__(qid=0, name="dom0", netid=0,
dir_path=None, dir_path=None,

5
core-modules/01QubesDisposableVm.py
View File

@ -48,6 +48,11 @@ class QubesDisposableVm(QubesVm):
attrs_config = super(QubesDisposableVm, self).get_attrs_config() attrs_config = super(QubesDisposableVm, self).get_attrs_config()
attrs_config['name']['eval'] = '"disp%d" % self._qid if value is None else value' attrs_config['name']['eval'] = '"disp%d" % self._qid if value is None else value'
attrs_config.pop('kernel')
attrs_config.pop('kernels_dir')
attrs_config.pop('kernelopts')
attrs_config.pop('uses_default_kernel')
attrs_config.pop('uses_default_kernelopts')
# New attributes # New attributes
attrs_config['dispid'] = { 'func': lambda x: self._qid if x is None else int(x), attrs_config['dispid'] = { 'func': lambda x: self._qid if x is None else int(x),