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

RHEL-85/90: modify the x86_64 EC2 images dracut configuration

Browse source 
Change the x86_64-specific dracut configuration of RHEL-8.5 and RHEL-9.0
EC2 and AMI images to not include `xen-netfront` driver and add `nvme`
driver, which was previously not included. Since the configuration is no
longer Xen-specific, rename the configuration file to `ec2.conf`.

Justification:
There is no reason to put `xen-netfront` to initramfs as EC2 images don't
boot from network root. In addition, add `nvme` driver to handle the case
when initramfs is getting forcefully rebuild on a Xen instance (and not able
to boot on Nitro after that).

Related to https://issues.redhat.com/browse/COMPOSER-1096.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-08-23 11:25:11 +02:00 • committed by Tomas Hozza
parent 20258bd45e
commit a8d503e5b9
6 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/distro/rhel85/pipelines.go
View file

@ -389,11 +389,13 @@ func ec2X86_64BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.Packag
}
// EC2 x86_64-specific stages
// Add 'nvme' driver to handle the case when initramfs is getting forcefully
// rebuild on a Xen instance (and not able to boot on Nitro after that).
treePipeline.AddStage(osbuild.NewDracutConfStage(&osbuild.DracutConfStageOptions{
Filename: "xen.conf",
Filename: "ec2.conf",
Config: osbuild.DracutConfigFile{
AddDrivers: []string{
"xen-netfront",
"nvme",
"xen-blkfront",
},
},

6
internal/distro/rhel90/pipelines.go
View file

@ -370,11 +370,13 @@ func ec2X86_64BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.Packag
}
// EC2 x86_64-specific stages
// Add 'nvme' driver to handle the case when initramfs is getting forcefully
// rebuild on a Xen instance (and not able to boot on Nitro after that).
treePipeline.AddStage(osbuild.NewDracutConfStage(&osbuild.DracutConfStageOptions{
Filename: "xen.conf",
Filename: "ec2.conf",
Config: osbuild.DracutConfigFile{
AddDrivers: []string{
"xen-netfront",
"nvme",
"xen-blkfront",
},
},

4
test/data/manifests/rhel_85-x86_64-ami-boot.json
View file

@ -1073,10 +1073,10 @@
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "xen.conf",
"filename": "ec2.conf",
"config": {
"add_drivers": [
"xen-netfront",
"nvme",
"xen-blkfront"
]
}

4
test/data/manifests/rhel_85-x86_64-ec2-boot.json
View file

@ -1077,10 +1077,10 @@
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "xen.conf",
"filename": "ec2.conf",
"config": {
"add_drivers": [
"xen-netfront",
"nvme",
"xen-blkfront"
]
}

4
test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
View file

@ -1251,10 +1251,10 @@
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "xen.conf",
"filename": "ec2.conf",
"config": {
"add_drivers": [
"xen-netfront",
"nvme",
"xen-blkfront"
]
}

4
test/data/manifests/rhel_90-x86_64-ami-boot.json
View file

@ -973,10 +973,10 @@
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "xen.conf",
"filename": "ec2.conf",
"config": {
"add_drivers": [
"xen-netfront",
"nvme",
"xen-blkfront"
]
}