From c7797cd5dc9673d0044d0fa68884c5c846024c73 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 12 Dec 2019 15:46:34 +1300 Subject: [PATCH] slightly cuter way of handling auto rebooting --- subiquity/controllers/installprogress.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/subiquity/controllers/installprogress.py b/subiquity/controllers/installprogress.py index 4ad286f9..26c4d55f 100644 --- a/subiquity/controllers/installprogress.py +++ b/subiquity/controllers/installprogress.py @@ -100,19 +100,20 @@ class InstallProgressController(BaseController): def __init__(self, app): super().__init__(app) self.model = app.base_model - self.auto_reboot = False - if self.answers.get('reboot', False): - self.auto_reboot = True self.progress_view = ProgressView(self) self.install_state = InstallState.NOT_STARTED self.journal_listener_handle = None + self.filesystem_event = asyncio.Event() - self.reboot_clicked = asyncio.Event() self._postinstall_prerequisites = { 'ssh': asyncio.Event(), 'identity': asyncio.Event(), 'snap': asyncio.Event(), } + self.reboot_clicked = asyncio.Event() + if self.answers.get('reboot', False): + self.reboot_clicked.set() + self.uu_running = False self.uu = None self._event_indent = "" @@ -298,8 +299,7 @@ class InstallProgressController(BaseController): except Exception: self.curtin_error() - if not self.auto_reboot: - await self.reboot_clicked.wait() + await self.reboot_clicked.wait() self.reboot()