run network answers in run_answers
This commit is contained in:
parent
287b4492e8
commit
d6f3f83622
|
@ -171,10 +171,6 @@ class NetworkController(NetworkController, SubiquityTuiController):
|
||||||
if not self.interactive():
|
if not self.interactive():
|
||||||
raise
|
raise
|
||||||
|
|
||||||
def run_answers(self):
|
|
||||||
# handled elsewhere
|
|
||||||
pass
|
|
||||||
|
|
||||||
def done(self):
|
def done(self):
|
||||||
self.configured()
|
self.configured()
|
||||||
super().done()
|
super().done()
|
||||||
|
|
|
@ -338,14 +338,6 @@ class NetworkController(TuiController):
|
||||||
if not silent:
|
if not silent:
|
||||||
self.apply_stopping()
|
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:
|
if not dhcp_events:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -477,6 +469,15 @@ class NetworkController(TuiController):
|
||||||
self.network_event_receiver.default_routes)
|
self.network_event_receiver.default_routes)
|
||||||
return self.view
|
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):
|
def end_ui(self):
|
||||||
self.view = None
|
self.view = None
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue