rename "reboot" controller/endpoint to "shutdown"
This commit is contained in:
parent
d44d29b3a5
commit
fc39247073
|
@ -42,6 +42,7 @@ subiquity/common/filesystem/tests/test_actions.py
|
||||||
subiquity/common/filesystem/tests/test_labels.py
|
subiquity/common/filesystem/tests/test_labels.py
|
||||||
subiquity/common/filesystem/tests/test_manipulator.py
|
subiquity/common/filesystem/tests/test_manipulator.py
|
||||||
subiquity/common/__init__.py
|
subiquity/common/__init__.py
|
||||||
|
subiquity/common/resources.py
|
||||||
subiquity/common/serialize.py
|
subiquity/common/serialize.py
|
||||||
subiquity/common/tests/__init__.py
|
subiquity/common/tests/__init__.py
|
||||||
subiquity/common/tests/test_serialization.py
|
subiquity/common/tests/test_serialization.py
|
||||||
|
@ -72,8 +73,11 @@ subiquitycore/ssh.py
|
||||||
subiquitycore/testing/__init__.py
|
subiquitycore/testing/__init__.py
|
||||||
subiquitycore/testing/view_helpers.py
|
subiquitycore/testing/view_helpers.py
|
||||||
subiquitycore/tests/__init__.py
|
subiquitycore/tests/__init__.py
|
||||||
|
subiquitycore/tests/mocks.py
|
||||||
subiquitycore/tests/test_netplan.py
|
subiquitycore/tests/test_netplan.py
|
||||||
|
subiquitycore/tests/test_pubsub.py
|
||||||
subiquitycore/tests/test_view.py
|
subiquitycore/tests/test_view.py
|
||||||
|
subiquitycore/tests/util.py
|
||||||
subiquitycore/tuicontroller.py
|
subiquitycore/tuicontroller.py
|
||||||
subiquitycore/tui.py
|
subiquitycore/tui.py
|
||||||
subiquitycore/ui/actionmenu.py
|
subiquitycore/ui/actionmenu.py
|
||||||
|
@ -120,6 +124,7 @@ subiquity/models/tests/__init__.py
|
||||||
subiquity/models/tests/test_filesystem.py
|
subiquity/models/tests/test_filesystem.py
|
||||||
subiquity/models/tests/test_mirror.py
|
subiquity/models/tests/test_mirror.py
|
||||||
subiquity/models/tests/test_subiquity.py
|
subiquity/models/tests/test_subiquity.py
|
||||||
|
subiquity/models/timezone.py
|
||||||
subiquity/models/updates.py
|
subiquity/models/updates.py
|
||||||
subiquity/server/controller.py
|
subiquity/server/controller.py
|
||||||
subiquity/server/controllers/cmdlist.py
|
subiquity/server/controllers/cmdlist.py
|
||||||
|
@ -135,21 +140,26 @@ subiquity/server/controllers/mirror.py
|
||||||
subiquity/server/controllers/network.py
|
subiquity/server/controllers/network.py
|
||||||
subiquity/server/controllers/package.py
|
subiquity/server/controllers/package.py
|
||||||
subiquity/server/controllers/proxy.py
|
subiquity/server/controllers/proxy.py
|
||||||
subiquity/server/controllers/reboot.py
|
|
||||||
subiquity/server/controllers/refresh.py
|
subiquity/server/controllers/refresh.py
|
||||||
subiquity/server/controllers/reporting.py
|
subiquity/server/controllers/reporting.py
|
||||||
|
subiquity/server/controllers/shutdown.py
|
||||||
subiquity/server/controllers/snaplist.py
|
subiquity/server/controllers/snaplist.py
|
||||||
subiquity/server/controllers/ssh.py
|
subiquity/server/controllers/ssh.py
|
||||||
subiquity/server/controllers/tests/test_keyboard.py
|
subiquity/server/controllers/tests/test_keyboard.py
|
||||||
|
subiquity/server/controllers/timezone.py
|
||||||
subiquity/server/controllers/updates.py
|
subiquity/server/controllers/updates.py
|
||||||
subiquity/server/controllers/userdata.py
|
subiquity/server/controllers/userdata.py
|
||||||
subiquity/server/controllers/zdev.py
|
subiquity/server/controllers/zdev.py
|
||||||
subiquity/server/dryrun.py
|
subiquity/server/dryrun.py
|
||||||
subiquity/server/errors.py
|
subiquity/server/errors.py
|
||||||
|
subiquity/server/geoip.py
|
||||||
subiquity/server/__init__.py
|
subiquity/server/__init__.py
|
||||||
subiquity/server/server.py
|
subiquity/server/server.py
|
||||||
|
subiquity/server/tests/__init__.py
|
||||||
|
subiquity/server/tests/test_geoip.py
|
||||||
subiquity/tests/fakes.py
|
subiquity/tests/fakes.py
|
||||||
subiquity/tests/__init__.py
|
subiquity/tests/__init__.py
|
||||||
|
subiquity/tests/test_timezonecontroller.py
|
||||||
subiquity/ui/frame.py
|
subiquity/ui/frame.py
|
||||||
subiquity/ui/__init__.py
|
subiquity/ui/__init__.py
|
||||||
subiquity/ui/mount.py
|
subiquity/ui/mount.py
|
||||||
|
|
|
@ -252,7 +252,7 @@ class SubiquityClient(TuiApplication):
|
||||||
elif event['SUBIQUITY_EVENT_TYPE'] == 'finish':
|
elif event['SUBIQUITY_EVENT_TYPE'] == 'finish':
|
||||||
print('finish: ' + event["MESSAGE"])
|
print('finish: ' + event["MESSAGE"])
|
||||||
context_name = event.get('SUBIQUITY_CONTEXT_NAME', '')
|
context_name = event.get('SUBIQUITY_CONTEXT_NAME', '')
|
||||||
if context_name == 'subiquity/Reboot/reboot':
|
if context_name == 'subiquity/Shutdown/shutdown':
|
||||||
self.exit()
|
self.exit()
|
||||||
|
|
||||||
async def connect(self):
|
async def connect(self):
|
||||||
|
|
|
@ -65,7 +65,7 @@ class ProgressController(SubiquityTuiController):
|
||||||
|
|
||||||
async def send_reboot_and_wait(self):
|
async def send_reboot_and_wait(self):
|
||||||
try:
|
try:
|
||||||
await self.app.client.reboot.POST()
|
await self.app.client.shutdown.POST()
|
||||||
except aiohttp.ClientError:
|
except aiohttp.ClientError:
|
||||||
pass
|
pass
|
||||||
self.app.exit()
|
self.app.exit()
|
||||||
|
|
|
@ -235,7 +235,7 @@ class API:
|
||||||
def GET() -> TimeZoneInfo: ...
|
def GET() -> TimeZoneInfo: ...
|
||||||
def POST(tz: str): ...
|
def POST(tz: str): ...
|
||||||
|
|
||||||
class reboot:
|
class shutdown:
|
||||||
def POST(): ...
|
def POST(): ...
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -25,9 +25,9 @@ from .mirror import MirrorController
|
||||||
from .network import NetworkController
|
from .network import NetworkController
|
||||||
from .package import PackageController
|
from .package import PackageController
|
||||||
from .proxy import ProxyController
|
from .proxy import ProxyController
|
||||||
from .reboot import RebootController
|
|
||||||
from .refresh import RefreshController
|
from .refresh import RefreshController
|
||||||
from .reporting import ReportingController
|
from .reporting import ReportingController
|
||||||
|
from .shutdown import ShutdownController
|
||||||
from .snaplist import SnapListController
|
from .snaplist import SnapListController
|
||||||
from .ssh import SSHController
|
from .ssh import SSHController
|
||||||
from .timezone import TimeZoneController
|
from .timezone import TimeZoneController
|
||||||
|
@ -50,9 +50,9 @@ __all__ = [
|
||||||
'NetworkController',
|
'NetworkController',
|
||||||
'PackageController',
|
'PackageController',
|
||||||
'ProxyController',
|
'ProxyController',
|
||||||
'RebootController',
|
|
||||||
'RefreshController',
|
'RefreshController',
|
||||||
'ReportingController',
|
'ReportingController',
|
||||||
|
'ShutdownController',
|
||||||
'SnapListController',
|
'SnapListController',
|
||||||
'SSHController',
|
'SSHController',
|
||||||
'TimeZoneController',
|
'TimeZoneController',
|
||||||
|
|
|
@ -29,19 +29,19 @@ from subiquity.server.controllers.install import ApplicationState
|
||||||
log = logging.getLogger("subiquity.controllers.restart")
|
log = logging.getLogger("subiquity.controllers.restart")
|
||||||
|
|
||||||
|
|
||||||
class RebootController(SubiquityController):
|
class ShutdownController(SubiquityController):
|
||||||
|
|
||||||
endpoint = API.reboot
|
endpoint = API.shutdown
|
||||||
|
|
||||||
def __init__(self, app):
|
def __init__(self, app):
|
||||||
super().__init__(app)
|
super().__init__(app)
|
||||||
self.user_reboot_event = asyncio.Event()
|
self.user_shutdown_event = asyncio.Event()
|
||||||
self.rebooting_event = asyncio.Event()
|
self.shuttingdown_event = asyncio.Event()
|
||||||
|
|
||||||
async def POST(self):
|
async def POST(self):
|
||||||
self.app.controllers.Install.stop_uu()
|
self.app.controllers.Install.stop_uu()
|
||||||
self.user_reboot_event.set()
|
self.user_shutdown_event.set()
|
||||||
await self.rebooting_event.wait()
|
await self.shuttingdown_event.wait()
|
||||||
|
|
||||||
def interactive(self):
|
def interactive(self):
|
||||||
return self.app.interactive
|
return self.app.interactive
|
||||||
|
@ -55,10 +55,10 @@ class RebootController(SubiquityController):
|
||||||
await self.app.controllers.Late.run_event.wait()
|
await self.app.controllers.Late.run_event.wait()
|
||||||
await self.copy_logs_to_target()
|
await self.copy_logs_to_target()
|
||||||
if self.app.interactive:
|
if self.app.interactive:
|
||||||
await self.user_reboot_event.wait()
|
await self.user_shutdown_event.wait()
|
||||||
self.reboot()
|
self.shutdown()
|
||||||
elif self.app.state == ApplicationState.DONE:
|
elif self.app.state == ApplicationState.DONE:
|
||||||
self.reboot()
|
self.shutdown()
|
||||||
|
|
||||||
@with_context()
|
@with_context()
|
||||||
async def copy_logs_to_target(self, context):
|
async def copy_logs_to_target(self, context):
|
||||||
|
@ -81,8 +81,8 @@ class RebootController(SubiquityController):
|
||||||
log.exception("saving journal failed")
|
log.exception("saving journal failed")
|
||||||
|
|
||||||
@with_context()
|
@with_context()
|
||||||
def reboot(self, context):
|
def shutdown(self, context):
|
||||||
self.rebooting_event.set()
|
self.shuttingdown_event.set()
|
||||||
if self.opts.dry_run:
|
if self.opts.dry_run:
|
||||||
self.app.exit()
|
self.app.exit()
|
||||||
else:
|
else:
|
|
@ -222,7 +222,7 @@ class SubiquityServer(Application):
|
||||||
"Install",
|
"Install",
|
||||||
"Updates",
|
"Updates",
|
||||||
"Late",
|
"Late",
|
||||||
"Reboot",
|
"Shutdown",
|
||||||
]
|
]
|
||||||
|
|
||||||
def make_model(self):
|
def make_model(self):
|
||||||
|
|
Loading…
Reference in New Issue