Only add the java.hostname on migration if not already present #479
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
More recent servers already have java.hostname in rhn.conf... adding it at migration would add two lines and blow when inspecting the container later at upgrade time.
To avoid getting multiple results breaking the inspect data file, limit the grep results from rhn.conf to one result.
aaannz
approved these changes
Oct 30, 2024
Comment on lines
+122
to
+124
| if test -z "$(grep '^java.hostname *=' /etc/rhn/rhn.conf)\"; then | ||
| sed 's/server\.jabber_server/java\.hostname/' -i /etc/rhn/rhn.conf; | ||
| fi |
There was a problem hiding this comment.
I don't think test -z is needed. Grep returns 1 if string not found.
Suggested change
| if test -z "$(grep '^java.hostname *=' /etc/rhn/rhn.conf)\"; then | |
| sed 's/server\.jabber_server/java\.hostname/' -i /etc/rhn/rhn.conf; | |
| fi | |
| if ! grep -q '^java.hostname *=' /etc/rhn/rhn.conf); then | |
| sed 's/server\.jabber_server/java\.hostname/' -i /etc/rhn/rhn.conf; | |
| fi |
should be enough, right?
mbussolotto
approved these changes
Oct 30, 2024
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.
What does this PR change?
More recent servers already have java.hostname in rhn.conf... adding it at migration would add two lines and blow when inspecting the container later at upgrade time.
Test coverage
No tests: Migration script is not unit tested yet: too hard to get meaningful tests
DONE
Links
Issue(s): uyuni-project/uyuni#8816 (comment)
Changelogs
Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository
If you don't need a changelog check, please mark this checkbox:
If you uncheck the checkbox after the PR is created, you will need to re-run
changelog_test(see below)Before you merge
Check How to branch and merge properly!