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

Fix missing arg to reset_volatile_storage (#118)

Browse Source 
And do not call it twice...
This commit is contained in:
Marek Marczykowski 2011-03-19 17:05:53 -04:00
parent bc383b692d
commit a5a43cdbc7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom0/qvm-core/qubes.py
View File

@ -890,7 +890,7 @@ class QubesTemplateVm(QubesVm):
return super(QubesTemplateVm, self).start(debug_console=debug_console, verbose=verbose) return super(QubesTemplateVm, self).start(debug_console=debug_console, verbose=verbose)
def reset_volatile_storage(): def reset_volatile_storage(self):
assert not self.is_running(), "Attempt to clean volatile image of running Template VM!" assert not self.is_running(), "Attempt to clean volatile image of running Template VM!"
print "--> Cleaning volatile image: {0}...".format (self.volatile_img) print "--> Cleaning volatile image: {0}...".format (self.volatile_img)
@ -1079,14 +1079,11 @@ class QubesCowVm(QubesVm):
if self.is_running(): if self.is_running():
raise QubesException("VM is already running!") raise QubesException("VM is already running!")
if not self.is_updateable():
self.reset_volatile_storage()
self.reset_volatile_storage() self.reset_volatile_storage()
return super(QubesCowVm, self).start(debug_console=debug_console, verbose=verbose, preparing_dvm=preparing_dvm) return super(QubesCowVm, self).start(debug_console=debug_console, verbose=verbose, preparing_dvm=preparing_dvm)
def reset_volatile_storage(): def reset_volatile_storage(self):
assert not self.is_running(), "Attempt to clean volatile image of running VM!" assert not self.is_running(), "Attempt to clean volatile image of running VM!"
# Only makes sense on template based VM # Only makes sense on template based VM