slightly cuter way of handling auto rebooting
This commit is contained in:
parent
00ab28aa78
commit
c7797cd5dc
|
@ -100,19 +100,20 @@ class InstallProgressController(BaseController):
|
||||||
def __init__(self, app):
|
def __init__(self, app):
|
||||||
super().__init__(app)
|
super().__init__(app)
|
||||||
self.model = app.base_model
|
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.progress_view = ProgressView(self)
|
||||||
self.install_state = InstallState.NOT_STARTED
|
self.install_state = InstallState.NOT_STARTED
|
||||||
self.journal_listener_handle = None
|
self.journal_listener_handle = None
|
||||||
|
|
||||||
self.filesystem_event = asyncio.Event()
|
self.filesystem_event = asyncio.Event()
|
||||||
self.reboot_clicked = asyncio.Event()
|
|
||||||
self._postinstall_prerequisites = {
|
self._postinstall_prerequisites = {
|
||||||
'ssh': asyncio.Event(),
|
'ssh': asyncio.Event(),
|
||||||
'identity': asyncio.Event(),
|
'identity': asyncio.Event(),
|
||||||
'snap': 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_running = False
|
||||||
self.uu = None
|
self.uu = None
|
||||||
self._event_indent = ""
|
self._event_indent = ""
|
||||||
|
@ -298,7 +299,6 @@ class InstallProgressController(BaseController):
|
||||||
except Exception:
|
except Exception:
|
||||||
self.curtin_error()
|
self.curtin_error()
|
||||||
|
|
||||||
if not self.auto_reboot:
|
|
||||||
await self.reboot_clicked.wait()
|
await self.reboot_clicked.wait()
|
||||||
|
|
||||||
self.reboot()
|
self.reboot()
|
||||||
|
|
Loading…
Reference in New Issue