Skip to content

Commit a82f4f2

Browse files
committed
Cleanup disposable on failed startup
On "cleanup()" of a disposable with "auto_cleanup" enabled, if the state is: - Running: "_auto_cleanup" is called by the event "domain-shutdown" and not on "cleanup()", to avoid recalling it which would cause problems; - Halted: "_auto_cleanup" should be called if domain is not running, but that check is unreliable due to many moving parts, so "DispVM.start" should contain a "cleanup(force=True)" because in that case, we are sure to certain degree that it works, per my tests. Bug introduced on commit f1cbf21, which did not enforce "_auto_cleanup" on "DispVM.start" For: #748 Fixes: QubesOS/qubes-issues#10928
1 parent 6a30230 commit a82f4f2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

qubes/vm/dispvm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ async def start(self, **kwargs):
10111011
await super().start(**kwargs)
10121012
except:
10131013
# Cleanup also on failed startup
1014-
await self.cleanup()
1014+
await self.cleanup(force=True)
10151015
raise
10161016

10171017
def create_qdb_entries(self) -> None:

0 commit comments

Comments
 (0)