StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slightly cuter way of handling auto rebooting

This commit is contained in:
Michael Hudson-Doyle 2019-12-12 15:46:34 +13:00
parent 00ab28aa78
commit c7797cd5dc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
subiquity/controllers/installprogress.py
View File

@ -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,8 +299,7 @@ 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()