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

QubesVm: ignore errors during debug VM config file creation

Browse Source 
Currently <vm-dir>/<vm-name>.conf file is used only for debugging
purposes - the real one is passed directly to libvirt, without storing
on disk for it.
In some cases (e.g. qvm-clone) QubesVM.create_config_file() can be
called before VM directory exists and in this case it would fail.
Because it isn't critical fail in any means (the config file will be
recreated on next occasion) just ignore this error.

Final version most likely will have this part of code removed
completely.
This commit is contained in:
Marek Marczykowski 2013-06-07 05:31:31 +02:00 committed by Marek Marczykowski-Górecki
parent f159f3e168
commit 457737b6cc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core-modules/000QubesVm.py
View File

@ -1114,10 +1114,15 @@ class QubesVm(object):
# FIXME: This is only for debugging purposes # FIXME: This is only for debugging purposes
old_umask = os.umask(002) old_umask = os.umask(002)
conf_appvm = open(file_path, "w") try:
conf_appvm.write(domain_config) conf_appvm = open(file_path, "w")
conf_appvm.close() conf_appvm.write(domain_config)
os.umask(old_umask) conf_appvm.close()
except:
# Ignore errors
pass
finally:
os.umask(old_umask)
return domain_config return domain_config