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.

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

Fix differences between 8.4 and 8.5 image definitions #1594

Merged
merged 3 commits into from
Jul 27, 2021

Conversation

achilleas-k
Copy link
Member

@achilleas-k achilleas-k commented Jul 27, 2021

This pull request includes:

  • adequate testing for the new functionality or fixed issue
  • adequate documentation informing people about the change such as

This PR is the result of a short investigation into the differences between the image types in RHEL 8.4 and 8.5, based on the output of the image-info tool (as it currently exists in the test manifests).

Elements fixed in this PR:

  • AMI package exclude list
    We (well, mostly @thozza) are working towards updating the AMI definitions to match the official images (https://issues.redhat.com/browse/COMPOSER-837). The AMI definition I added in RHEL 8.5: main image types #1536 was an initial step towards this, where I updated the package list from the 8.4 definition. Unfortunately, I neglected to include some packages to the exclusion list. That's been fixed now.
    • I reverted the change in the AMI package lists since @thozza is currently working on bringing those up to date separately.
  • GRUB 2 saved entry
    As a consequence of the new way the blueprint packages are handled (as a separate package set), the wrong package set was searched for to detect the kernel and add the saved GRUB 2 value. Fixed now.

Below is a list of other differences and the reasons they appeared.

All (or most) image types

New udev rule

Introduced in 8.5

"/etc/udev/rules.d": {
  "70-persistent-ipoib.rules": []
}

Added by rdma-core.

New package dependency for libpcap.

New rhsm options

  • auto_registration
  • auto_registration_interval

Added in org.osbuild.rhsm stage

Edge commit

rhsm.conf

Removed from 8.5.

This is expected: Subscription manager was meant to be excluded (#893) but then was re-added (un-excluded) (#1231) to edge image types. Now it's no longer installed even when not explicitly excluded.

dnf

Removed from 8.5

This is expected: dependency of subman (see above).

@achilleas-k achilleas-k marked this pull request as ready for review July 27, 2021 10:50
The package set is needed by the GRUB 2 stage options function to find
the Kernel package in order to add the saved entry option. The Kernel
package is defined in the blueprints package set, not the OS package
set.

Signed-off-by: Achilleas Koutsou <[email protected]>
Signed-off-by: Achilleas Koutsou <[email protected]>
Signed-off-by: Achilleas Koutsou <[email protected]>
Copy link
Member

@teg teg left a comment

Choose a reason for hiding this comment

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

Thanks for the fixes!

@teg teg merged commit df1eddb into osbuild:main Jul 27, 2021
@achilleas-k achilleas-k deleted the fix/84-85-diffs branch July 28, 2021 05:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants