Skip to content

live: fix_bootconfig.s390x: restore initrd.off naming for the initrd offset#1974

Merged
imobachgs merged 2 commits intoagama-project:masterfrom
g7:epaolantonio/16.0-s390x-offline-fix-followup
Feb 7, 2025
Merged

live: fix_bootconfig.s390x: restore initrd.off naming for the initrd offset#1974
imobachgs merged 2 commits intoagama-project:masterfrom
g7:epaolantonio/16.0-s390x-offline-fix-followup

Conversation

@g7
Copy link
Copy Markdown
Contributor

@g7 g7 commented Feb 5, 2025

See discussion in bsc#1236781, and #1969.

This essentially reverts c3c8fc4.

Problem

initrd.ofs was a red herring, and I'm not sure how we got to that, most likely it might have slipped in while manually debugging the media.

So the actual bug was the offset file not being created at all, and now it's sorted out too by adding the xxd requirement (and thanks to snwint, latest mksusecd can re-generate it as well).

Solution

Restore the previous initrd.off naming which is widely used. The other commit from #1969 is not reverted (that introduces set -e in the fix_bootconfig scripts) so builds will still fail if xxd is not present in the build environment.

Testing

  • Tested manually

Apologies for the noise.

…offset

See discussion in bsc#1236781, and gh#agama-project#1969.

This essentially reverts c3c8fc4.

Signed-off-by: Eugenio Paolantonio <eugenio.paolantonio@suse.com>
@g7 g7 force-pushed the epaolantonio/16.0-s390x-offline-fix-followup branch from f2da9e0 to 72f49ea Compare February 5, 2025 11:00
Copy link
Copy Markdown
Contributor

@imobachgs imobachgs left a comment

Choose a reason for hiding this comment

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

Thank you, @g7!

@imobachgs imobachgs merged commit 081c7b1 into agama-project:master Feb 7, 2025
@imobachgs imobachgs mentioned this pull request Feb 26, 2025
imobachgs added a commit that referenced this pull request Feb 26, 2025
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