fix(dracut-rescue): use entry token instead of machine-id for path construction - #2444
Draft
mxsb wants to merge 5 commits into
Draft
fix(dracut-rescue): use entry token instead of machine-id for path construction#2444mxsb wants to merge 5 commits into
mxsb wants to merge 5 commits into
Conversation
…nstruction 51-dracut-rescue.install hardcodes $MACHINE_ID for boot directory and loader entry paths. When kernel-install is configured with a non-machine-id entry token (e.g. via bootctl --entry-token=os-id), the paths diverge from the actual boot directory layout, breaking rescue image creation. Use $KERNEL_INSTALL_ENTRY_TOKEN (exported by kernel-install since systemd 253) with a fallback to $MACHINE_ID for path construction. Rescue image filenames and BLS content fields keep using $MACHINE_ID as an identifier. Add a test variant to TEST-43 that runs kernel-install with a custom entry token and verifies the rescue initrd is placed correctly. Fixes: dracut-ng#2443
3 tasks
bdrung
reviewed
Jul 22, 2026
bdrung
left a comment
bdrung
left a comment
Member
There was a problem hiding this comment.
Can you rebase your changes instead of merging main into it?
Comment on lines
99
to
100
| KERNEL="vmlinuz-0-rescue-${MACHINE_ID}" | ||
| INITRD="initramfs-0-rescue-${MACHINE_ID}.img" |
Collaborator
devkontrol
marked this pull request as draft
August 10, 2026 13:58
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
51-dracut-rescue.installhardcodes$MACHINE_IDfor boot directory and loader entry paths. Whenkernel-installis configured with a non-machine-id entry token (e.g. viabootctl --entry-token=os-id), the paths diverge from the actual boot directory layout, breaking rescue image creation.Use
$KERNEL_INSTALL_ENTRY_TOKEN(exported bykernel-installsince systemd 253) with a fallback to$MACHINE_IDfor path construction. Rescue image filenames and BLS content fields keep using$MACHINE_IDas an identifier.Fixes: #2443
Checklist