p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14923 from Djelibeybi/fix14905

Browse Source 
Switch to using only the RPM command to determine the distro version.
Upstream-commit: 0852170e8c9787bf277b054ef08ed2c038a40dec
Component: engine
This commit is contained in:
David Calavera
2015-07-27 12:01:57 -07:00
parent 6f5eddf659 219631f054
commit 07ad6dff5c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/hack/install.sh
View File

@ -140,12 +140,12 @@ do_install() {
fi
if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then
lsb_dist='fedora'
dist_version="$(rpm -qa \*-release | cut -d"-" -f3 | head -n1)"
dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n")"
fi
if [ -z "$lsb_dist" ]; then
if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then
lsb_dist='centos'
dist_version="$(rpm -qa \*-release | cut -d"-" -f3 | head -n1)"
dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n")"
fi
fi
if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then