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

app: fix creating dom0 object when not already present in qubes.xml

Browse Source 
It's constant properties are now really constant, no need to provide
them explicitly.
This commit is contained in:
Marek Marczykowski-Górecki 2017-12-01 03:03:44 +01:00
parent 0afee4b05e
commit d54cef5554
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/app.py
View File

@ -837,7 +837,7 @@ class Qubes(qubes.PropertyHolder):
if 0 not in self.domains: if 0 not in self.domains:
self.domains.add( self.domains.add(
qubes.vm.adminvm.AdminVM(self, None, qid=0, name='dom0'), qubes.vm.adminvm.AdminVM(self, None),
_enable_events=False) _enable_events=False)
# stage 3: load global properties # stage 3: load global properties

3
qubes/vm/__init__.py
View File

@ -354,6 +354,9 @@ class BaseVM(qubes.PropertyHolder):
del self.tags del self.tags
def load_extras(self): def load_extras(self):
if self.xml is None:
return
# features # features
for node in self.xml.xpath('./features/feature'): for node in self.xml.xpath('./features/feature'):
self.features[node.get('name')] = node.text self.features[node.get('name')] = node.text