Fix for SUSE Expanded Support detection#49538
Merged
rallytime merged 1 commit intoSep 7, 2018
Merged
Conversation
terminalmage
suggested changes
Sep 6, 2018
Contributor
There was a problem hiding this comment.
This should be salt.utils.files.fopen() in develop now.
Contributor
Author
There was a problem hiding this comment.
Thanks for catching this. Fixed it and squashed the commits.
A SUSE ES installation has both, the centos-release and redhat-release file. Since os_data only used the centos-release file to detect a CentOS installation, this lead to SUSE ES being detected as CentOS. This change also adds a check for redhat-release and then marks the 'lsb_distrib_id' as RedHat.
terminalmage
approved these changes
Sep 7, 2018
alexey-zhukovin
pushed a commit
to alexey-zhukovin/salt
that referenced
this pull request
May 8, 2020
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 do?
A SUSE ES installation has both, the
centos-releaseandredhat-releasefile. Since
os_data()only used thecentos-releasefile to detect aCentOS installation, this lead to SUSE ES being detected as CentOS.
This change also adds a check for
redhat-releaseand then marks thelsb_distrib_idas RedHat.Previous Behavior
New Behavior
Tests written?
No
Commits signed with GPG?
Yes