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

Merge remote-tracking branch 'qubesos/pr/53'

Browse Source 
* qubesos/pr/53:
  template-postprocess: fast path for file-reflink, like file
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-14 04:45:59 +01:00
commit 5a4577417f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubesadmin/tools/qvm_template_postprocess.py
View File

@ -100,8 +100,9 @@ def import_root_img(vm, source_dir):
# and destination paths are the same # and destination paths are the same
vid = vm.volumes['root'].vid vid = vm.volumes['root'].vid
pool = vm.app.pools[vm.volumes['root'].pool] pool = vm.app.pools[vm.volumes['root'].pool]
if pool.driver == 'file' and root_path == os.path.join( if (pool.driver in ('file', 'file-reflink')
pool.config['dir_path'], vid + '.img'): and root_path == os.path.join(pool.config['dir_path'],
vid + '.img')):
vm.log.info('root.img already in place, do not re-import') vm.log.info('root.img already in place, do not re-import')
return return
with open(root_path, 'rb') as root_file: with open(root_path, 'rb') as root_file: