Fixes #14223 - Handles atomic machine detection properly #81
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
|
Look at https://bugzilla.redhat.com/show_bug.cgi?id=1200122 for more info |
| @@ -23,8 +23,9 @@ chmod 644 $KATELLO_CERT_DIR/$KATELLO_SERVER_CA_CERT | |||
| echo "$KATELLO_DEFAULT_CA_DATA" > $KATELLO_CERT_DIR/$KATELLO_DEFAULT_CA_CERT | |||
| chmod 644 $KATELLO_CERT_DIR/$KATELLO_DEFAULT_CA_CERT | |||
|
|
|||
| # if not atomic machine, regular rhel then handle traditional way | |||
| if [ -e "/run/ostree-booted" ] | |||
| # if atomic machine handlle it the atomic way, else handle the regular rhel way | |||
Made the code check for a IS_ATOMIC env variable, and expects that the provisioning scripts will call that Works great for redhat 7.2 + centos
|
ACK |
|
thanks @parthaa |
jlsherrill
added a commit
that referenced
this pull request
Mar 17, 2016
Fixes #14223 - Handles atomic machine detection properly
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.
Made the code check for "Atomic Host" in /etc/os-release
Works great for redhat 7.2