(RHEL-50672) Harden /bin/kernel-install to avoid failing silently when /etc/machine-id doesn't end with newline #290
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
github-actions
bot
changed the title
github-actions
bot
added
pr/needs-ci
Commit validationTracker - RHEL-50672 The following commits meet all requirements
Tracker validationSuccess🟢 Tracker RHEL-50672 has set desired product: Pull Request validationSuccess🟢 CI - All checks have passed Auto MergeSuccess🟢 Pull Request is not marked as draft and it's not blocked by |
Let's do at least a minimal check that the read machine ID is valid. RHEL-only: feature Related: RHEL-50672
If /etc/machine-id doesn't end with a newline (which is wrong, but it can happen), kernel-install fails. That's because `read` returns 1 if it reaches EOF and we're using `set -e`. Let's just ignore that error, as it doesn't matter: we have either read a valid machine ID, in which case we continue, or we haven't, in which case we exit anyway. RHEL-only: feature Resolves: RHEL-50672
dtardon
force-pushed
the
RHEL-50672-machine-id
branch
from
c53d2b6 to
48eac39
Compare
msekletar
approved these changes
Aug 1, 2024
| [ "$MACHINE_ID" = "uninitialized" ] && unset MACHINE_ID | ||
| if [ "$MACHINE_ID" = "uninitialized" ]; then | ||
| unset MACHINE_ID | ||
| elif [ {{ '${#MACHINE_ID}' }} -ne 32 ]; then |
There was a problem hiding this comment.
Took me a bit to realize why this is needed, those pesky Jinja comments :)
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.
Resolves: RHEL-50672