зеркало из https://github.com/microsoft/docker.git
Merge pull request #14923 from Djelibeybi/fix14905
Switch to using only the RPM command to determine the distro version.
This commit is contained in:
Коммит
0852170e8c
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче