particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages/modprobe: configuration_files → config

Browse source 
Rename the `configuration_files` key to `config` key.
This commit is contained in:
Christian Kellner 2021-07-21 08:09:51 +00:00
parent 9e259ae0bc
commit f259b4e5ca
3 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
stages/org.osbuild.modprobe
View file

@ -2,10 +2,8 @@
"""
Configure modprobe
The option 'configuration_files' allows to create `.conf` configuration files
for modprobe in `/usr/lib/modprobe.d`. At least one configuration file must
be defined. Value os the options is a dictionary with keys being the names
of `.conf` files which will be created. Value of each key is a list
The 'config' option allows the creation of one ore more `.conf` configuration
files for modprobe in `/usr/lib/modprobe.d`. The value of each key is a list
of "command" objects with at least the 'command' property and additional
properties specific for each command type. The list must contain at least one
"command" object.
@ -26,7 +24,7 @@ import osbuild.api
SCHEMA = r"""
"additionalProperties": false,
"properties": {
"configuration_files": {
"config": {
"additionalProperties": false,
"type": "object",
"description": "modprobe configuration files.",
@ -85,7 +83,7 @@ def create_configuration_files(tree, configuration_files_options):
def main(tree, options):
configuration_files_options = options.get("configuration_files", {})
configuration_files_options = options.get("config", {})
create_configuration_files(tree, configuration_files_options)

2
test/data/stages/modprobe/b.json
View file

@ -457,7 +457,7 @@
{
"name": "org.osbuild.modprobe",
"options": {
"configuration_files": {
"config": {
"disallow-modules.conf": [
{
"command": "blacklist",

38
test/data/stages/modprobe/b.mpp.json
View file

@ -23,30 +23,32 @@
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/"
}
],
"packages": ["kmod"]
"packages": [
"kmod"
]
}
}
},
{
"name": "org.osbuild.modprobe",
"options": {
"configuration_files": {
"disallow-modules.conf": [
{
"command": "blacklist",
"modulename": "nouveau"
},
{
"command": "blacklist",
"modulename": "floppy"
}
],
"disallow-additional-modules.conf": [
{
"command": "blacklist",
"modulename": "my-module"
}
]
"config": {
"disallow-modules.conf": [
{
"command": "blacklist",
"modulename": "nouveau"
},
{
"command": "blacklist",
"modulename": "floppy"
}
],
"disallow-additional-modules.conf": [
{
"command": "blacklist",
"modulename": "my-module"
}
]
}
}
}