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

pipeline/stage/grub2: support explicit legacy/uefi API

Browse source 
This allows legacy bootloader and UEFI bootloaders to be
enabled/disabled independently of each other.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2019-12-12 19:20:57 +01:00 • committed by Lars Karlitski
parent 7e4c4e4f6d
commit 18971bd8ef
27 changed files with 70 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/cases/ami_empty_blueprint.json
View file

@ -103,7 +103,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernel_opts": "ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200"
"kernel_opts": "ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200",
"legacy": true
}
},
{

3
test/cases/disk_empty_blueprint.json
View file

@ -96,7 +96,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": true
}
},
{

3
test/cases/disk_local_boot.json
View file

@ -120,7 +120,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": true
}
},
{

3
test/cases/ext4_empty_blueprint.json
View file

@ -80,7 +80,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": true
}
},
{

3
test/cases/ext4_local_boot.json
View file

@ -105,7 +105,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": true
}
},
{

3
test/cases/openstack_empty_blueprint.json
View file

@ -100,7 +100,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": true
}
},
{

3
test/cases/openstack_local_boot.json
View file

@ -124,7 +124,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": true
}
},
{

3
test/cases/qcow2_empty_blueprint.json
View file

@ -101,7 +101,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": true
}
},
{

3
test/cases/qcow2_local_boot.json
View file

@ -125,7 +125,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": true
}
},
{

3
test/cases/rhel82_ami.json
View file

@ -148,7 +148,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernel_opts": "ro console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto"
"kernel_opts": "ro console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
"legacy": true
}
},
{

3
test/cases/rhel82_ext4_filesystem.json
View file

@ -98,7 +98,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernel_opts": "ro net.ifnames=0"
"kernel_opts": "ro net.ifnames=0",
"legacy": true
}
},
{

3
test/cases/rhel82_openstack.json
View file

@ -106,7 +106,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernel_opts": "ro net.ifnames=0"
"kernel_opts": "ro net.ifnames=0",
"legacy": true
}
},
{

3
test/cases/rhel82_partitioned_disk.json
View file

@ -112,7 +112,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernel_opts": "ro net.ifnames=0"
"kernel_opts": "ro net.ifnames=0",
"legacy": true
}
},
{

3
test/cases/rhel82_qcow2.json
View file

@ -123,7 +123,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernel_opts": "ro net.ifnames=0"
"kernel_opts": "ro net.ifnames=0",
"legacy": true
}
},
{

3
test/cases/rhel82_tar.json
View file

@ -98,7 +98,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernel_opts": "ro net.ifnames=0"
"kernel_opts": "ro net.ifnames=0",
"legacy": true
}
},
{

3
test/cases/rhel82_vhd.json
View file

@ -111,7 +111,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
"kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0",
"legacy": true
}
},
{

3
test/cases/rhel82_vmdk.json
View file

@ -116,7 +116,8 @@
"name": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd",
"kernel_opts": "ro net.ifnames=0"
"kernel_opts": "ro net.ifnames=0",
"legacy": true
}
},
{

3
test/cases/tar_local_boot.json
View file

@ -105,7 +105,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": true
}
},
{

3
test/cases/vhd_empty_blueprint.json
View file

@ -99,7 +99,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": true
}
},
{

3
test/cases/vhd_local_boot.json
View file

@ -123,7 +123,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": true
}
},
{

3
test/cases/vmdk_empty_blueprint.json
View file

@ -97,7 +97,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": true
}
},
{

3
test/cases/vmdk_local_boot.json
View file

@ -121,7 +121,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": true
}
},
{