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 handling of zipl.conf in plain zipl bootloader #2612

Merged
merged 1 commit into from
Aug 11, 2024

Conversation

schaefi
Copy link
Collaborator

@schaefi schaefi commented Aug 9, 2024

When using the plain zipl bootloader kiwi created a /etc/zipl.conf file. However, this file was only useful during image build as it points to a loop target device and geometry but does not represent a proper config file to be used in the running system. In addition the different distributors provides their own version and layout of the zipl.conf to be used inside of the system and with their respective tools. Thus this commit changes the way how kiwi operates in a way that the zipl.conf used in the initial image only exists during the image build process. An eventual present /etc/zipl.conf will not be touched by kiwi. This Fixes #2597

When using the plain zipl bootloader kiwi created a /etc/zipl.conf
file. However, this file was only useful during image build as it
points to a loop target device and geometry but does not represent
a proper config file to be used in the running system. In addition
the different distributors provides their own version and layout
of the zipl.conf to be used inside of the system and with their
respective tools. Thus this commit changes the way how kiwi operates
in a way that the zipl.conf used in the initial image only exists
during the image build process. An eventual present /etc/zipl.conf
will not be touched by kiwi. This Fixes #2597
@schaefi schaefi requested a review from Conan-Kudo August 9, 2024 10:11
@schaefi schaefi self-assigned this Aug 9, 2024
@schaefi
Copy link
Collaborator Author

schaefi commented Aug 9, 2024

This PR must be used in Staging to check that no integration test broke. No merge before we have a green check mark here.

@schaefi
Copy link
Collaborator Author

schaefi commented Aug 9, 2024

ok integration test looks good

[  167s] [ INFO    ]: 11:10:10 | Creating zipl bootloader configuration
[  172s] [ DEBUG   ]: 11:10:15 | EXEC: [chroot /var/tmp/kiwi_mount_manager.iayfardu zipl --noninteractive --config /kiwi_zipl.conf_uf8ecf9d --blsdir /boot/loader/entries --verbose]

@Conan-Kudo
Copy link
Member

shellcheck Expected — Waiting for status to be reported seems to be stuck, so I'm force merging it.

@Conan-Kudo Conan-Kudo merged commit 57e9623 into main Aug 11, 2024
12 checks passed
@Conan-Kudo Conan-Kudo deleted the fix_zipl_artifact branch August 11, 2024 17:13
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.

invalid /etc/zipl.conf in Fedora images
2 participants