kill off other top level signals

This commit is contained in:
Michael Hudson-Doyle 2019-12-16 23:05:35 +13:00
parent 2765e6a773
commit 01e5261b3f
3 changed files with 4 additions and 11 deletions

View File

@ -264,4 +264,4 @@ class IdentityController(BaseController):
# current process).
disable_console_conf()
self.signal.emit_signal('quit')
self.app.exit()

View File

@ -407,7 +407,7 @@ class InstallProgressController(BaseController):
def reboot(self):
if self.opts.dry_run:
log.debug('dry-run enabled, skipping reboot, quitting instead')
self.signal.emit_signal('quit')
self.app.exit()
else:
# TODO Possibly run this earlier, to show a warning; or
# switch to shutdown if chreipl fails

View File

@ -413,13 +413,6 @@ class Application:
def _connect_base_signals(self):
"""Connect signals used in the core controller."""
signals = [
('quit', self.exit),
]
if self.opts.dry_run:
signals.append(('control-x-quit', self.exit))
self.signal.connect_signals(signals)
# Registers signals from each controller
for controller in self.controllers.instances:
controller.register_signals()
@ -552,8 +545,8 @@ class Application:
self.loop.screen.clear()
def unhandled_input(self, key):
if key == 'ctrl x':
self.signal.emit_signal('control-x-quit')
if self.opts.dry_run and key == 'ctrl x':
self.exit()
elif key == 'f3':
self.loop.screen.clear()
elif key in ['ctrl t', 'f4']: