remove overly obscure curtin_reboot function
This commit is contained in:
parent
1706fd886d
commit
348ef91fe0
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue