01fips: Properly creating path to .hmac of kernel based on BOOT_IMAGE #343
Conversation
This file contains 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
…MAGE 8f5c5 broke the case where BOOT_IMAGE is not set at all. This code should handle following: 1) BOOT_IMAGE not set 2) BOOT_IMAGE set to something unrelated (s390) 3) BOOT_IMAGE=vmlinuz-4.14.7-300.fc27.x86_64 4) BOOT_IMAGE=/vmlinuz-4.14.7-300.fc27.x86_64 5) BOOT_IMAGE=/boot/vmlinuz-4.14.7-300.fc27.x86_64 6) BOOT_IMAGE=subdir/vmlinuz-4.14.7-300.fc27.x86_64 7) BOOT_IMAGE=/subdir/vmlinuz-4.14.7-300.fc27.x86_64 8) BOOT_IMAGE=/boot/subdir/vmlinuz-4.14.7-300.fc27.x86_64 https://bugzilla.redhat.com/show_bug.cgi?id=1415032
lnykryn
force-pushed
the
boot_image_once_more
branch
from
120d77c
to
d818986
Compare
jlebon
added a commit
to jlebon/dracut
that referenced
this pull request
Oct 29, 2019
There is a small regression in dracutdevs#343: when handling the 'separate boot partition' case, we're checking for the kernel image in the wrong location: `BOOT_IMAGE` is the `/boot`-relative path to the kernel image, so `/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE}` expands to e.g. `/boot/mysubdir1/mysubdir2/mysubdir1/mysubdir2/vmlinuz...`. We should be using `BOOT_IMAGE_NAME` here instead (and in fact, the next if-statement does this correctly, so it might've just been accidentally left out of dracutdevs#343).
lnykryn
pushed a commit
that referenced
this pull request
Oct 31, 2019
There is a small regression in #343: when handling the 'separate boot partition' case, we're checking for the kernel image in the wrong location: `BOOT_IMAGE` is the `/boot`-relative path to the kernel image, so `/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE}` expands to e.g. `/boot/mysubdir1/mysubdir2/mysubdir1/mysubdir2/vmlinuz...`. We should be using `BOOT_IMAGE_NAME` here instead (and in fact, the next if-statement does this correctly, so it might've just been accidentally left out of #343).
lnykryn
pushed a commit
that referenced
this pull request
Oct 31, 2019
There is a small regression in #343: when handling the 'separate boot partition' case, we're checking for the kernel image in the wrong location: `BOOT_IMAGE` is the `/boot`-relative path to the kernel image, so `/boot/${BOOT_IMAGE_PATH}/${BOOT_IMAGE}` expands to e.g. `/boot/mysubdir1/mysubdir2/mysubdir1/mysubdir2/vmlinuz...`. We should be using `BOOT_IMAGE_NAME` here instead (and in fact, the next if-statement does this correctly, so it might've just been accidentally left out of #343).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
8f5c5 broke the case where BOOT_IMAGE is not set at all.
This code should handle following:
https://bugzilla.redhat.com/show_bug.cgi?id=1415032