From docker/docker - Switch to using only the RPM command to determine the distro version.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
This commit is contained in:
Avi Miller authored and Eli Uriegas committed 2017-06-16 11:53:39 -07:00
1 parent 18ecac1598
commit e574f678ac
1 file changed
+2 -2
+2 -2
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