stages/org.osbuild.ostree.config: support bls-append-except-default
Support setting the sysroot.bls-append-except-default value in the OSTree config. This is used by CoreOS to support configuration used for GRUB password support https://github.com/coreos/fedora-coreos-tracker/issues/1333
This commit is contained in:
parent
73ec3122f2
commit
d089b429a7
3 changed files with 11 additions and 1 deletions
|
|
@ -42,6 +42,10 @@ SCHEMA = """
|
||||||
"readonly": {
|
"readonly": {
|
||||||
"description": "Read only sysroot and boot",
|
"description": "Read only sysroot and boot",
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"bls-append-except-default": {
|
||||||
|
"description": "Set value for bls-append-except-default",
|
||||||
|
"type": "string"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -64,6 +68,10 @@ def main(tree, options):
|
||||||
ro = "true" if readonly else "false"
|
ro = "true" if readonly else "false"
|
||||||
ostree.cli("config", "set", "sysroot.readonly", ro, repo=repo)
|
ostree.cli("config", "set", "sysroot.readonly", ro, repo=repo)
|
||||||
|
|
||||||
|
bls_append_except_default = sysroot_options.get("bls-append-except-default")
|
||||||
|
if bls_append_except_default:
|
||||||
|
ostree.cli("config", "set", "sysroot.bls-append-except-default", bls_append_except_default, repo=repo)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
stage_args = osbuild.api.arguments()
|
stage_args = osbuild.api.arguments()
|
||||||
|
|
|
||||||
|
|
@ -466,7 +466,8 @@
|
||||||
"config": {
|
"config": {
|
||||||
"sysroot": {
|
"sysroot": {
|
||||||
"readonly": false,
|
"readonly": false,
|
||||||
"bootloader": "none"
|
"bootloader": "none",
|
||||||
|
"bls-append-except-default": "grub_users=\"\""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,7 @@ pipelines:
|
||||||
sysroot:
|
sysroot:
|
||||||
readonly: false
|
readonly: false
|
||||||
bootloader: none
|
bootloader: none
|
||||||
|
bls-append-except-default: grub_users=""
|
||||||
- type: org.osbuild.mkdir
|
- type: org.osbuild.mkdir
|
||||||
options:
|
options:
|
||||||
paths:
|
paths:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue