Fix openSUSE leap and SLES detection in Chef 14 #1377
Merged
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
Clear Linux OS also ships a /etc/os-release file. A check for /usr/lib/os-release file returns true for openSUSE Leap and SLES distributions, but we are not handling them in that block. It is easier just to move Clear Linux check to /etc/os-release. Left the existing code block there to handle any weird edge cases where /usr/lib/os-release exists but /etc/os-release doesn't. Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
balasankarc
force-pushed
the
fix-opensuse-leap-chef-14
branch
from
8074e8e
to
320a6b5
Compare
balasankarc
commented
Jun 14, 2019
| @@ -266,7 +266,8 @@ def determine_platform_family | |||
| elsif File.exist?("/etc/alpine-release") | |||
| platform "alpine" | |||
| platform_version File.read("/etc/alpine-release").strip | |||
| elsif File.exist?("/usr/lib/os-release") | |||
| # If /etc/os-release file exists, we take that as source of truth | |||
| elsif File.exist?("/usr/lib/os-release") && !File.exist?("/etc/os-release") | |||
There was a problem hiding this comment.
@tas50 Does this make sense? && !File.exist?("/etc/os-release") essentially ensures openSUSE Leap and SLES not match with this check.
There was a problem hiding this comment.
CI failures doesn't seem related to my change. 🤔
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
|
Thanks @balasankarc |
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Detection of openSUSE leap and SLES distributions fail with Chef 14 because these distributions satisfy the
if File.exist?('/usr/lib/os-release')check. However, in that check, we only consider Clear Linux and not anything else, thus causing detection to fail for any other OS.In my experiments, all the Clear Linux distributions provided
/etc/os-releasefile also. So, moving Clear Linux detection to be based on that file, and using/usr/lib/os-releaseonly if/etc/os-releaseis not found (to handle any weird edge cases out there) seems like a safe option to handle Clear Linux, openSUSE Leap and SLES.Related Issue
#1343
Types of changes
Checklist: