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:
parent
151b6e48ae
commit
011cf6851b
3 changed files with 12 additions and 1 deletions
|
|
@ -39,6 +39,10 @@ SCHEMA = """
|
|||
"type": "string",
|
||||
"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": {
|
||||
"description": "Read only sysroot and boot",
|
||||
"type": "boolean"
|
||||
|
|
@ -63,6 +67,11 @@ def main(tree, options):
|
|||
if bootloader:
|
||||
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")
|
||||
if readonly is not None: # can be False, which we would want to set
|
||||
ro = "true" if readonly else "false"
|
||||
|
|
|
|||
|
|
@ -467,7 +467,8 @@
|
|||
"sysroot": {
|
||||
"readonly": true,
|
||||
"bootloader": "none",
|
||||
"bls-append-except-default": "grub_users=\"\""
|
||||
"bls-append-except-default": "grub_users=\"\"",
|
||||
"bootprefix": true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ pipelines:
|
|||
readonly: true
|
||||
bootloader: none
|
||||
bls-append-except-default: grub_users=""
|
||||
bootprefix: true
|
||||
- type: org.osbuild.mkdir
|
||||
options:
|
||||
paths:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue