Skip to content

Commit

Permalink
ostree.config: add bootloader config option
Browse files Browse the repository at this point in the history
Ability to set the bootloader backend that OSTree should use. NB:
normally this should be set to `none` since in modern distros and
bootloaders the BLS is used and the BLS snippets are generated on
`none` but none of the of the specific bootloader tools are run,
like `grub2-mkconfig` for grub.

Update the fedora image manifest to use that config setting.
  • Loading branch information
gicmo authored and achilleas-k committed Sep 9, 2021
1 parent 187681f commit 7ec305a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
8 changes: 8 additions & 0 deletions stages/org.osbuild.ostree.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Change OSTree configuration
Change the configuration for an OSTree repository.
Currently only the following values are supported:
- `sysroot.readonly`
- `sysroot.bootloader`
See `ostree.repo-config(5)` for more information.
"""

import os
Expand Down Expand Up @@ -32,6 +35,11 @@ SCHEMA = """
"additionalProperties": false,
"description": "Options concerning the sysroot",
"properties": {
"bootloader": {
"description": "Configure the bootloader that OSTree uses (use 'none' for BLS).",
"type": "string",
"enum": ["none", "auto", "grub2", "syslinux", "uboot", "zipl"]
},
"readonly": {
"description": "Read only sysroot and boot",
"type": "boolean"
Expand Down
3 changes: 2 additions & 1 deletion test/data/manifests/fedora-ostree-image.json
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,8 @@
"repo": "/ostree/repo",
"config": {
"sysroot": {
"readonly": true
"readonly": true,
"bootloader": "none"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion test/data/manifests/fedora-ostree-image.mpp.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@
"repo": "/ostree/repo",
"config": {
"sysroot": {
"readonly": true
"readonly": true,
"bootloader": "none"
}
}
}
Expand Down

0 comments on commit 7ec305a

Please sign in to comment.