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

remove overly obscure curtin_reboot function

This commit is contained in:
Michael Hudson-Doyle 2017-01-25 14:08:51 +13:00
parent 1706fd886d
commit 348ef91fe0
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subiquity/controllers/installprogress.py
View File

@ -24,7 +24,6 @@ from subiquitycore.controller import BaseController
from subiquity.curtin import (CURTIN_CONFIGS, from subiquity.curtin import (CURTIN_CONFIGS,
CURTIN_INSTALL_LOG, CURTIN_INSTALL_LOG,
CURTIN_POSTINSTALL_LOG, CURTIN_POSTINSTALL_LOG,
curtin_reboot,
curtin_install_cmd) curtin_install_cmd)
from subiquity.models import InstallProgressModel from subiquity.models import InstallProgressModel
from subiquity.ui.views import ProgressView from subiquity.ui.views import ProgressView
@ -220,8 +219,8 @@ class InstallProgressController(BaseController):
if self.opts.dry_run: if self.opts.dry_run:
log.debug('dry-run enabled, skipping reboot, quiting instead') log.debug('dry-run enabled, skipping reboot, quiting instead')
self.signal.emit_signal('quit') self.signal.emit_signal('quit')
else:
curtin_reboot() utils.run_command(["/sbin/reboot"])
def quit(self): def quit(self):
utils.disable_subiquity() utils.disable_subiquity()

14
subiquity/curtin.py
View File

@ -221,17 +221,3 @@ def curtin_install_cmd(configs):
log.info('curtin install command: {}'.format(" ".join(install_cmd))) log.info('curtin install command: {}'.format(" ".join(install_cmd)))
return 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