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

storage/lvm: minor fixes

Browse Source 
QubesOS/qubes-issues#2256
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-26 11:42:24 +02:00
parent a748b393f4
commit 28f78ed3b8
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/storage/lvm.py
View File

@ -120,7 +120,7 @@ class ThinPool(qubes.storage.Pool):
# implementation detail volume # implementation detail volume
continue continue
config = { config = {
'pool': self.name, 'pool': self,
'vid': vid, 'vid': vid,
'name': vid, 'name': vid,
'volume_group': self.volume_group, 'volume_group': self.volume_group,
@ -305,8 +305,6 @@ class ThinVolume(qubes.storage.Volume):
if not src_volume.save_on_stop: if not src_volume.save_on_stop:
return self return self
src_path = src_volume.export()
# HACK: neat trick to speed up testing if you have same physical thin # HACK: neat trick to speed up testing if you have same physical thin
# pool assigned to two qubes-pools i.e: qubes_dom0 and test-lvm # pool assigned to two qubes-pools i.e: qubes_dom0 and test-lvm
# pylint: disable=line-too-long # pylint: disable=line-too-long
@ -316,7 +314,7 @@ class ThinVolume(qubes.storage.Volume):
qubes_lvm(cmd, self.log) qubes_lvm(cmd, self.log)
else: else:
self.create() self.create()
src_path = src_volume.export()
cmd = ['sudo', 'dd', 'if=' + src_path, 'of=/dev/' + self.vid, cmd = ['sudo', 'dd', 'if=' + src_path, 'of=/dev/' + self.vid,
'conv=sparse'] 'conv=sparse']
subprocess.check_call(cmd) subprocess.check_call(cmd)