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

qvm-create fix access to volume paths

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-06-16 20:02:58 +02:00
parent 732d2b33f4
commit 457c915d03
No known key found for this signature in database
GPG Key ID: 96ED3C3BA19C3DEE
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qubes/tools/qvm_create.py
View File

@ -146,17 +146,20 @@ def main(args=None):
try: try:
vm.create_on_disk() vm.create_on_disk()
# TODO this is file pool specific. Change it to a more general
# solution
root_img_path = vm.volumes['root'].vid
if args.root_move_from is not None: if args.root_move_from is not None:
# if (options.verbose): # if (options.verbose):
# print "--> Replacing root.img with provided file" # print "--> Replacing root.img with provided file"
os.unlink(vm.root_img) os.unlink(root_img_path)
os.rename(args.root_move_from, vm.root_img) os.rename(args.root_move_from, root_img_path)
elif args.root_copy_from is not None: elif args.root_copy_from is not None:
# if (options.verbose): # if (options.verbose):
# print "--> Replacing root.img with provided file" # print "--> Replacing root.img with provided file"
os.unlink(vm.root_img) os.unlink(root_img_path)
# use 'cp' to preserve sparse file # use 'cp' to preserve sparse file
subprocess.check_call(['cp', args.root_copy_from, vm.root_img]) subprocess.check_call(['cp', args.root_copy_from, root_img_path])
except (IOError, OSError) as err: except (IOError, OSError) as err:
parser.error(str(err)) parser.error(str(err))