Merge pull request #1473 from ogayot/codecs
codecs: add ability to install ubuntu-restricted-addons
This commit is contained in:
commit
632e099e1a
|
@ -420,6 +420,14 @@
|
||||||
"additionalProperties": false
|
"additionalProperties": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"codecs": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"install": {
|
||||||
|
"type": "boolean"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"drivers": {
|
"drivers": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
|
@ -411,6 +411,23 @@ A list of SSH public keys to install in the initial user's account.
|
||||||
**type:** boolean
|
**type:** boolean
|
||||||
**default:** `true` if `authorized_keys` is empty, `false` otherwise
|
**default:** `true` if `authorized_keys` is empty, `false` otherwise
|
||||||
|
|
||||||
|
<a name="codecs"></a>
|
||||||
|
|
||||||
|
### codecs
|
||||||
|
|
||||||
|
**type:** mapping, see below
|
||||||
|
**default:** see below
|
||||||
|
**can be interactive:** no
|
||||||
|
|
||||||
|
Configure whether common restricted packages (including codecs) from [multiverse] should be installed.
|
||||||
|
|
||||||
|
#### install
|
||||||
|
|
||||||
|
**type:** boolean
|
||||||
|
**default:** `false`
|
||||||
|
|
||||||
|
Whether to install the ubuntu-restricted-addons package.
|
||||||
|
|
||||||
<a name="drivers"></a>
|
<a name="drivers"></a>
|
||||||
|
|
||||||
### drivers
|
### drivers
|
||||||
|
|
|
@ -442,6 +442,14 @@ The [JSON schema](https://json-schema.org/) for autoinstall data is as follows:
|
||||||
"additionalProperties": false
|
"additionalProperties": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"codecs": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"install": {
|
||||||
|
"type": "boolean"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"drivers": {
|
"drivers": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|
|
@ -44,6 +44,7 @@ from subiquity.common.types import (
|
||||||
ReformatDisk,
|
ReformatDisk,
|
||||||
RefreshStatus,
|
RefreshStatus,
|
||||||
ShutdownMode,
|
ShutdownMode,
|
||||||
|
CodecsData,
|
||||||
DriversResponse,
|
DriversResponse,
|
||||||
DriversPayload,
|
DriversPayload,
|
||||||
SnapInfo,
|
SnapInfo,
|
||||||
|
@ -316,6 +317,10 @@ class API:
|
||||||
def POST(data: Payload[ModifyPartitionV2]) \
|
def POST(data: Payload[ModifyPartitionV2]) \
|
||||||
-> StorageResponseV2: ...
|
-> StorageResponseV2: ...
|
||||||
|
|
||||||
|
class codecs:
|
||||||
|
def GET() -> CodecsData: ...
|
||||||
|
def POST(data: Payload[CodecsData]) -> None: ...
|
||||||
|
|
||||||
class drivers:
|
class drivers:
|
||||||
def GET(wait: bool = False) -> DriversResponse: ...
|
def GET(wait: bool = False) -> DriversResponse: ...
|
||||||
def POST(data: Payload[DriversPayload]) -> None: ...
|
def POST(data: Payload[DriversPayload]) -> None: ...
|
||||||
|
|
|
@ -543,6 +543,11 @@ class DriversResponse:
|
||||||
search_drivers: bool
|
search_drivers: bool
|
||||||
|
|
||||||
|
|
||||||
|
@attr.s(auto_attribs=True)
|
||||||
|
class CodecsData:
|
||||||
|
install: bool
|
||||||
|
|
||||||
|
|
||||||
@attr.s(auto_attribs=True)
|
@attr.s(auto_attribs=True)
|
||||||
class DriversPayload:
|
class DriversPayload:
|
||||||
install: bool
|
install: bool
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
# Copyright 2022 Canonical, Ltd.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
log = logging.getLogger('subiquity.models.codecs')
|
||||||
|
|
||||||
|
|
||||||
|
class CodecsModel:
|
||||||
|
do_install = False
|
||||||
|
|
||||||
|
async def target_packages(self):
|
||||||
|
# NOTE currently, ubuntu-restricted-addons is an empty package that
|
||||||
|
# pulls relevant packages through Recommends: Ideally, we should make
|
||||||
|
# sure to run the APT command for this package with the
|
||||||
|
# --install-recommends option.
|
||||||
|
return ["ubuntu-restricted-addons"] if self.do_install else []
|
|
@ -46,6 +46,7 @@ from subiquitycore.lsb_release import lsb_release
|
||||||
from subiquity.common.resources import get_users_and_groups
|
from subiquity.common.resources import get_users_and_groups
|
||||||
from subiquity.server.types import InstallerChannels
|
from subiquity.server.types import InstallerChannels
|
||||||
|
|
||||||
|
from .codecs import CodecsModel
|
||||||
from .drivers import DriversModel
|
from .drivers import DriversModel
|
||||||
from .filesystem import FilesystemModel
|
from .filesystem import FilesystemModel
|
||||||
from .identity import IdentityModel
|
from .identity import IdentityModel
|
||||||
|
@ -173,6 +174,7 @@ class SubiquityModel:
|
||||||
self.target = root
|
self.target = root
|
||||||
self.chroot_prefix = []
|
self.chroot_prefix = []
|
||||||
|
|
||||||
|
self.codecs = CodecsModel()
|
||||||
self.debconf_selections = DebconfSelectionsModel()
|
self.debconf_selections = DebconfSelectionsModel()
|
||||||
self.drivers = DriversModel()
|
self.drivers = DriversModel()
|
||||||
self.filesystem = FilesystemModel()
|
self.filesystem = FilesystemModel()
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from .cmdlist import EarlyController, LateController, ErrorController
|
from .cmdlist import EarlyController, LateController, ErrorController
|
||||||
|
from .codecs import CodecsController
|
||||||
from .debconf import DebconfController
|
from .debconf import DebconfController
|
||||||
from .drivers import DriversController
|
from .drivers import DriversController
|
||||||
from .filesystem import FilesystemController
|
from .filesystem import FilesystemController
|
||||||
|
@ -39,6 +40,7 @@ from .userdata import UserdataController
|
||||||
from .zdev import ZdevController
|
from .zdev import ZdevController
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
'CodecsController',
|
||||||
'DebconfController',
|
'DebconfController',
|
||||||
'DriversController',
|
'DriversController',
|
||||||
'EarlyController',
|
'EarlyController',
|
||||||
|
|
|
@ -0,0 +1,62 @@
|
||||||
|
# Copyright 2022 Canonical, Ltd.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from subiquity.common.apidef import API
|
||||||
|
from subiquity.common.types import CodecsData
|
||||||
|
from subiquity.server.controller import SubiquityController
|
||||||
|
|
||||||
|
log = logging.getLogger('subiquity.server.controllers.codecs')
|
||||||
|
|
||||||
|
|
||||||
|
class CodecsController(SubiquityController):
|
||||||
|
|
||||||
|
endpoint = API.codecs
|
||||||
|
|
||||||
|
autoinstall_key = model_name = "codecs"
|
||||||
|
autoinstall_schema = {
|
||||||
|
'type': 'object',
|
||||||
|
'properties': {
|
||||||
|
'install': {
|
||||||
|
'type': 'boolean',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
autoinstall_default = {"install": False}
|
||||||
|
|
||||||
|
def serialize(self):
|
||||||
|
return self.model.do_install
|
||||||
|
|
||||||
|
def deserialize(self, data):
|
||||||
|
if data is None:
|
||||||
|
return
|
||||||
|
self.model.do_install = data
|
||||||
|
|
||||||
|
def make_autoinstall(self):
|
||||||
|
return {
|
||||||
|
"install": self.model.do_install,
|
||||||
|
}
|
||||||
|
|
||||||
|
def load_autoinstall_data(self, data):
|
||||||
|
if data is not None and "install" in data:
|
||||||
|
self.model.do_install = data["install"]
|
||||||
|
|
||||||
|
async def GET(self) -> CodecsData:
|
||||||
|
return CodecsData(install=self.model.do_install)
|
||||||
|
|
||||||
|
async def POST(self, data: CodecsData) -> None:
|
||||||
|
self.model.do_install = data.install
|
||||||
|
await self.configured()
|
|
@ -217,7 +217,7 @@ POSTINSTALL_MODEL_NAMES = ModelNames({
|
||||||
"ubuntu_pro",
|
"ubuntu_pro",
|
||||||
"userdata",
|
"userdata",
|
||||||
},
|
},
|
||||||
desktop={"timezone"})
|
desktop={"timezone", "codecs"})
|
||||||
|
|
||||||
|
|
||||||
class SubiquityServer(Application):
|
class SubiquityServer(Application):
|
||||||
|
@ -260,6 +260,7 @@ class SubiquityServer(Application):
|
||||||
"Identity",
|
"Identity",
|
||||||
"SSH",
|
"SSH",
|
||||||
"SnapList",
|
"SnapList",
|
||||||
|
"Codecs",
|
||||||
"Drivers",
|
"Drivers",
|
||||||
"TimeZone",
|
"TimeZone",
|
||||||
"Install",
|
"Install",
|
||||||
|
|
Loading…
Reference in New Issue