Skip to content

Commit

Permalink
Merge pull request #81 from parthaa/atomic-test
Browse files Browse the repository at this point in the history
Fixes #14223 - Handles atomic machine detection properly
  • Loading branch information
jlsherrill committed Mar 17, 2016
2 parents ec829dc + c2c6ca5 commit 4da2557
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions templates/rhsm-katello-reconfigure.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ 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 handle it the atomic way, else handle the regular rhel way
if [ -n "${IS_ATOMIC+1}" ] || [ -e "/run/ostree-booted" ]
then
#atomic setup
BASEURL=https://$KATELLO_SERVER/pulp/ostree/web/
Expand Down

0 comments on commit 4da2557

Please sign in to comment.