stages(ostree.config): support setting sysroot.bootprefix

See https://github.com/ostreedev/ostree/pull/2705 and also
https://github.com/osbuild/osbuild/issues/1566.
This commit is contained in:
Dusty Mabe 2024-02-05 23:27:59 -05:00 committed by Michael Vogt
parent 151b6e48ae
commit 011cf6851b
3 changed files with 12 additions and 1 deletions

View file

@ -39,6 +39,10 @@ SCHEMA = """
"type": "string", "type": "string",
"enum": ["none", "auto", "grub2", "syslinux", "uboot", "zipl", "aboot"] "enum": ["none", "auto", "grub2", "syslinux", "uboot", "zipl", "aboot"]
}, },
"bootprefix": {
"description": "If set to true, the bootloader entries generated will include /boot as a prefix.",
"type": "boolean"
},
"readonly": { "readonly": {
"description": "Read only sysroot and boot", "description": "Read only sysroot and boot",
"type": "boolean" "type": "boolean"
@ -63,6 +67,11 @@ def main(tree, options):
if bootloader: if bootloader:
ostree.cli("config", "set", "sysroot.bootloader", bootloader, repo=repo) ostree.cli("config", "set", "sysroot.bootloader", bootloader, repo=repo)
bootprefix = sysroot_options.get("bootprefix")
if bootprefix is not None: # can be False, which we would want to set
bp = "true" if bootprefix else "false"
ostree.cli("config", "set", "sysroot.bootprefix", bp, repo=repo)
readonly = sysroot_options.get("readonly") readonly = sysroot_options.get("readonly")
if readonly is not None: # can be False, which we would want to set if readonly is not None: # can be False, which we would want to set
ro = "true" if readonly else "false" ro = "true" if readonly else "false"

View file

@ -467,7 +467,8 @@
"sysroot": { "sysroot": {
"readonly": true, "readonly": true,
"bootloader": "none", "bootloader": "none",
"bls-append-except-default": "grub_users=\"\"" "bls-append-except-default": "grub_users=\"\"",
"bootprefix": true
} }
} }
} }

View file

@ -98,6 +98,7 @@ pipelines:
readonly: true readonly: true
bootloader: none bootloader: none
bls-append-except-default: grub_users="" bls-append-except-default: grub_users=""
bootprefix: true
- type: org.osbuild.mkdir - type: org.osbuild.mkdir
options: options:
paths: paths: