Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manifests: Prepare for CentOS Stream 9 -> 10 transition #3015

Merged
merged 3 commits into from
Sep 19, 2024
Merged

manifests: Prepare for CentOS Stream 9 -> 10 transition #3015

merged 3 commits into from
Sep 19, 2024

Conversation

travier
Copy link
Member

@travier travier commented Jun 6, 2024 •
edited
Loading

manifests: Move NetworkManager-team/teamd to EL9 shared manifest

libteam support is removed in CentOS Stream 10. Move packages related to
this support to a Enterprise Linux 9 only manifest to prepare for that
removal.

See: coreos/fedora-coreos-tracker#1727

manifests: Move runc to EL9 shared manifest

runc is not included in CentOS Stream 10. Move the runc package to an
Enterprise Linux 9 only manifest to prepare for that removal.

manifests: Move GPU firmwares & kdump tools to EL10 shared manifest

Move packages to an Enterprise Linux 10 only manifest to prepare
for the package split changes:

  • GPU firmwares are split into their own package in CentOS Stream 10
  • kdump tools are split between kexec-utils, makedumpfile and
    kdump-utils

See also: openshift/os#1498

@travier travier marked this pull request as draft June 6, 2024 12:17
@travier
Copy link
Member Author

travier commented Jun 6, 2024

Draft as some changes have not been confirmed yet.

@travier travier mentioned this pull request Jun 6, 2024
Open
@travier travier mentioned this pull request Aug 28, 2024
Open
@travier
Copy link
Member Author

travier commented Aug 28, 2024 •
edited
Loading

Another option for the sgdisk transition to avoid having to set a custom path in the Ignition RPM and in the script here is to install /usr/libexec/ignition-sgdisk to /usr/sbin/sgdisk only in the initramfs via a dracut module, as we will need a custom dracut module either way to install this vendored version.

@jlebon
Copy link
Member

jlebon commented Aug 28, 2024

The only real use of sgdisk in this repo is for the UUID restamp and moving the GPT backup header. We should be able to do those with sfdisk, which supports --relocate gpt-bak-std. For the stamping, there's --disk-id, but it doesn't natively support generating a random one, so we'd have to generate it ourselves and pass it in.

Overall that use can easily be dropped since it's much more scoped and easier to verify that it's equivalent to the sgdisk bit. Not sure it's worth trying to piggy back on Ignition's sgdisk.

@travier
Copy link
Member Author

travier commented Aug 29, 2024

OK. I don't want to do the gdisk -> fdisk migration in FCOS now so I'll remove that change and I'll install sgdisk in the PATH only in the initramfs for now in SCOS

@travier travier force-pushed the testing-devel-c10s branch 2 times, most recently from 7f865c8 to feaabbd Compare August 29, 2024 10:45
@travier travier marked this pull request as ready for review September 13, 2024 17:10
@travier
Copy link
Member Author

travier commented Sep 13, 2024

I think those changes are ready and should be a NOP for FCOS.

travier added a commit to travier/os that referenced this pull request Sep 13, 2024
@travier
overlay.d/05rhcos: Add dracut module to install vendored gdisk
8ef7986 
See: coreos/ignition#1926
See: https://issues.redhat.com/browse/RHEL-56080
See: coreos/fedora-coreos-config#3015
@dustymabe
Copy link
Member

LGTM - can we merge next Monday once we get the F41/beta next built?

@travier
manifests: Move NetworkManager-team/teamd to EL9 shared manifest
52f8bc3 
libteam support is removed in CentOS Stream 10. Move packages related to
this support to a Enterprise Linux 9 only manifest to prepare for that
removal.

See: coreos/fedora-coreos-tracker#1727
@travier
manifests: Move runc to EL9 shared manifest
79418f8 
runc is not included in CentOS Stream 10. Move the runc package to an
Enterprise Linux 9 only manifest to prepare for that removal.
@travier
manifests: Move GPU firmwares & kdump tools to EL10 shared manifest
2c658ba 
Move packages to an Enterprise Linux 10 only manifest to prepare
for the package split changes:
- GPU firmwares are split into their own package in CentOS Stream 10
- kdump tools are split between kexec-utils, makedumpfile and
  kdump-utils
@travier
Copy link
Member Author

travier commented Sep 18, 2024

Alright, I've rebased this to re-run the tests. Let's get this in now that we're good with F41?

travier added a commit to travier/os that referenced this pull request Sep 18, 2024
@travier
overlay.d/05rhcos: Add dracut module to install vendored gdisk
fb22df3 
See: coreos/ignition#1926
See: https://issues.redhat.com/browse/RHEL-56080
See: coreos/fedora-coreos-config#3015
dustymabe
dustymabe approved these changes Sep 18, 2024
View reviewed changes
Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dustymabe dustymabe merged commit 65d8ce8 into coreos:testing-devel Sep 19, 2024
3 checks passed
travier added a commit to travier/os that referenced this pull request Sep 30, 2024
@travier
overlay.d/05rhcos: Add dracut module to install vendored gdisk
2ac0032 
See: coreos/ignition#1926
See: https://issues.redhat.com/browse/RHEL-56080
See: coreos/fedora-coreos-config#3015
@travier travier deleted the testing-devel-c10s branch September 30, 2024 13:32
travier added a commit to travier/os that referenced this pull request Sep 30, 2024
@travier
overlay.d/05rhcos: Add dracut module to install vendored gdisk
ad25ab6 
See: coreos/ignition#1926
See: https://issues.redhat.com/browse/RHEL-56080
See: coreos/fedora-coreos-config#3015
travier added a commit to travier/os that referenced this pull request Oct 21, 2024
@travier
overlay.d/05rhcos: Add dracut module to install vendored gdisk
152ba3d 
See: coreos/ignition#1926
See: https://issues.redhat.com/browse/RHEL-56080
See: coreos/fedora-coreos-config#3015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dustymabe dustymabe dustymabe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@travier @jlebon @dustymabe