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

storage: few more merge fixes

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-02-09 00:24:40 +01:00 committed by Wojtek Porczyk
parent 926596cba7
commit db20581340
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qubes/__init__.py
View File

@ -1145,6 +1145,7 @@ class Qubes(PropertyHolder):
# TODO #1637 #892 # TODO #1637 #892
check_updates_vm = property('check_updates_vm', check_updates_vm = property('check_updates_vm',
type=bool, setter=property.bool, type=bool, setter=property.bool,
default=True,
doc='check for updates inside qubes') doc='check for updates inside qubes')

6
qubes/storage/xen.py
View File

@ -99,7 +99,7 @@ class XenStorage(qubes.storage.Storage):
element = lxml.etree.Element('disk') element = lxml.etree.Element('disk')
element.set('type', 'block') element.set('type', 'block')
element.set('device', type) element.set('device', devtype)
element.append(lxml.etree.Element('driver', name='phy')) element.append(lxml.etree.Element('driver', name='phy'))
element.append(lxml.etree.Element('source', dev=path)) element.append(lxml.etree.Element('source', dev=path))
@ -157,10 +157,10 @@ class XenStorage(qubes.storage.Storage):
def private_dev_config(self): def private_dev_config(self):
self.format_disk_dev(self.private_img, self.private_dev) return self.format_disk_dev(self.private_img, self.private_dev)
def volatile_dev_config(self): def volatile_dev_config(self):
self.format_disk_dev(self.volatile_img, self.volatile_dev) return self.format_disk_dev(self.volatile_img, self.volatile_dev)
def create_on_disk_private_img(self, source_template=None): def create_on_disk_private_img(self, source_template=None):