From 348ef91fe08bb7debcfe5babf91580f93eac49a0 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 25 Jan 2017 14:08:51 +1300 Subject: [PATCH] remove overly obscure curtin_reboot function --- subiquity/controllers/installprogress.py | 5 ++--- subiquity/curtin.py | 14 -------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/subiquity/controllers/installprogress.py b/subiquity/controllers/installprogress.py index 6f6c411b..ecdfd7d0 100644 --- a/subiquity/controllers/installprogress.py +++ b/subiquity/controllers/installprogress.py @@ -24,7 +24,6 @@ from subiquitycore.controller import BaseController from subiquity.curtin import (CURTIN_CONFIGS, CURTIN_INSTALL_LOG, CURTIN_POSTINSTALL_LOG, - curtin_reboot, curtin_install_cmd) from subiquity.models import InstallProgressModel from subiquity.ui.views import ProgressView @@ -220,8 +219,8 @@ class InstallProgressController(BaseController): if self.opts.dry_run: log.debug('dry-run enabled, skipping reboot, quiting instead') self.signal.emit_signal('quit') - - curtin_reboot() + else: + utils.run_command(["/sbin/reboot"]) def quit(self): utils.disable_subiquity() diff --git a/subiquity/curtin.py b/subiquity/curtin.py index 122e70e7..36745ef5 100644 --- a/subiquity/curtin.py +++ b/subiquity/curtin.py @@ -221,17 +221,3 @@ def curtin_install_cmd(configs): log.info('curtin install command: {}'.format(" ".join(install_cmd))) return install_cmd - - -def curtin_reboot(): - cmd = "/sbin/reboot" - log.info("powering off with %s", cmd) - fid = os.fork() - if fid == 0: - try: - subprocess.call([cmd]) - os._exit(0) - except: - log.warn("%s returned non-zero" % cmd) - os._exit(1) - return