run network answers in run_answers

This commit is contained in:
Michael Hudson-Doyle 2020-10-12 11:58:08 +13:00
parent 287b4492e8
commit d6f3f83622
2 changed files with 9 additions and 12 deletions

View File

@ -171,10 +171,6 @@ class NetworkController(NetworkController, SubiquityTuiController):
if not self.interactive():
raise
def run_answers(self):
# handled elsewhere
pass
def done(self):
self.configured()
super().done()

View File

@ -338,14 +338,6 @@ class NetworkController(TuiController):
if not silent:
self.apply_stopping()
if self.answers.get('accept-default', False):
self.done()
elif self.answers.get('actions', False):
actions = self.answers['actions']
self.answers.clear()
self.app.aio_loop.create_task(
self._run_actions(actions))
if not dhcp_events:
return
@ -477,6 +469,15 @@ class NetworkController(TuiController):
self.network_event_receiver.default_routes)
return self.view
def run_answers(self):
if self.answers.get('accept-default', False):
self.done()
elif self.answers.get('actions', False):
actions = self.answers['actions']
self.answers.clear()
self.app.aio_loop.create_task(
self._run_actions(actions))
def end_ui(self):
self.view = None