openstack/devstack
Code Issues Proposed changes

Add rhel to DISTRO match

Browse Source 
Match RHEL and CentOS and provide them as a DISTRO prefix of "rhel"

Change-Id: Ida19130ce9499d4d1fd2360fadc6b870b24bbc95
This commit is contained in:
Ian Wienand
2013-03-20 14:51:06 +11:00
parent 4b1dbb5dab
commit d857f4b4a4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
functions
View File

@@ -408,6 +408,9 @@ function GetDistro() {
else
DISTRO="sle${os_RELEASE}sp${os_UPDATE}"
fi
elif [[ "$os_VENDOR" =~ (Red Hat) || "$os_VENDOR" =~ (CentOS) ]]; then
# Drop the . release as we assume it's compatible
DISTRO="rhel${os_RELEASE::1}"
else
# Catch-all for now is Vendor + Release + Update
DISTRO="$os_VENDOR-$os_RELEASE.$os_UPDATE"
@@ -440,7 +443,6 @@ function is_fedora {
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || [ "$os_VENDOR" = "CentOS" ]
}
# Determine if current distribution is a SUSE-based distribution
# (openSUSE, SLE).
# is_suse