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

hvm: do not reset root.img to template state when debug mode enabled

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-21 04:36:53 +01:00
parent a457b62728
commit aeb83d1a45
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core-modules/01QubesHVm.py
View File

@ -263,7 +263,16 @@ class QubesHVm(QubesVm):
return return
if os.path.exists (self.volatile_img): if os.path.exists (self.volatile_img):
os.remove (self.volatile_img) if self.debug:
if os.path.getmtime(self.template.root_img) > os.path.getmtime(self.volatile_img):
if kwargs.get("verbose", False):
print >>sys.stderr, "--> WARNING: template have changed, resetting root.img"
else:
if kwargs.get("verbose", False):
print >>sys.stderr, "--> Debug mode: not resetting root.img"
print >>sys.stderr, "--> Debug mode: if you want to force root.img reset, either update template VM, or remove volatile.img file"
return
os.remove (self.volatile_img)
f_volatile = open (self.volatile_img, "w") f_volatile = open (self.volatile_img, "w")
f_root = open (self.template.root_img, "r") f_root = open (self.template.root_img, "r")