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

stages/grub2: default to disabling legacy support

Browse source 
For the sake of backwards compatibility, legacy support was enabled
by default. Flip this around, so that leaving the parameter out
means disabling it.

This is more intuitive, and will pave the way for dropping support
for the value being a bool in the future.

`osbuild-composer` always passes the argumnet explicitly, though
still always as a boolean.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-04-14 21:29:53 +02:00
parent de7227965f
commit 9d79d5fcc3
8 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
samples/base-qcow2.json
View file

@ -50,7 +50,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernel_opts": "ro biosdevname=0 net.ifnames=0"
"kernel_opts": "ro biosdevname=0 net.ifnames=0",
"legacy": "i386-pc"
}
},
{

3
samples/base-rawfs.json
View file

@ -51,7 +51,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernel_opts": "ro biosdevname=0 net.ifnames=0"
"kernel_opts": "ro biosdevname=0 net.ifnames=0",
"legacy": "i386-pc"
}
},
{

3
samples/base-rpm-qcow2.json
View file

@ -924,7 +924,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernel_opts": "ro biosdevname=0 net.ifnames=0"
"kernel_opts": "ro biosdevname=0 net.ifnames=0",
"legacy": "i386-pc"
}
},
{

3
samples/cloud-base.json
View file

@ -53,7 +53,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "ea711a29-e460-4879-9d70-9da99ae021f9",
"kernel_opts": "ro biosdevname=0 net.ifnames=0"
"kernel_opts": "ro biosdevname=0 net.ifnames=0",
"legacy": "i386-pc"
}
},
{

1
samples/f30-aarch64.json
View file

@ -74,7 +74,6 @@
"options": {
"root_fs_uuid": "7acfe2cc-4134-482a-a9d4-4979a5a87569",
"kernel_opts": "ro biosdevname=0 net.ifnames=0 console=ttyS0 console=tty1",
"legacy": false,
"uefi": {
"vendor": "fedora"
}

3
samples/f30-base-uefi.json
View file

@ -78,7 +78,8 @@
"kernel_opts": "ro biosdevname=0 net.ifnames=0 console=ttyS0 console=tty1",
"uefi": {
"vendor": "fedora"
}
},
"legacy": "i386-pc"
}
},
{

12
stages/org.osbuild.grub2
View file

@ -19,9 +19,9 @@ behavior in Fedora 30 and later.
This stage will overwrite `/etc/default/grub`, `/boot/grub2/grubenv`, and
`/boot/grub2/grub.cfg`. (Leading directories will be created if not present.)
If Legacy boot support is requested (the default, or explicitly via `legacy`)
this stage will also overwrite `/boot/grub2/grub.cfg` and will copy the
GRUB2 files from the buildhost into the target tree:
If Legacy boot support is requested via `legacy` this stage will also
overwrite `/boot/grub2/grub.cfg` and will copy the GRUB2 files from the
buildhost into the target tree:
* `/usr/share/grub/unicode.pf2` -> `/boot/grub2/fonts/`
* `/usr/lib/grub/$platform/*.{mod,lst}` -> `/boot/grub2/$platform/`
* NOTE: skips `fdt.lst`, which is an empty file
@ -67,8 +67,8 @@ STAGE_OPTS = """
"legacy": {
"description": "Include legacy boot support",
"oneOf": [
{"type": "boolean", "default": true},
{"type": "string", "default": "i386-pc"}
{"type": "boolean", "default": false},
{"type": "string"}
]
},
"uefi": {
@ -135,7 +135,7 @@ def main(tree, options):
root_fs_uuid = options["root_fs_uuid"]
boot_fs_uuid = options.get("boot_fs_uuid", None)
kernel_opts = options.get("kernel_opts", "")
legacy = options.get("legacy", True)
legacy = options.get("legacy", None)
uefi = options.get("uefi", None)
# legacy boolean means the

3
test/pipelines/f30-boot.json
View file

@ -924,7 +924,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernel_opts": "ro biosdevname=0 net.ifnames=0"
"kernel_opts": "ro biosdevname=0 net.ifnames=0",
"legacy": "i386-pc"
}
},
{