docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix installation script for RHEL 

the previous fix changed the lsb_dist variable
too early. We only normalize to "centos"
for the repository-location, so changing
it just before that.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 73d5f0648e430a74cd05ff9fd335611ddc6dd2a1)
This commit is contained in:
Sebastiaan van Stijn 2016-06-22 11:21:19 -07:00 committed by Tibor Vass
parent 7a5e247d01
commit 63ce6b60d5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/install.sh
View File

@ -243,8 +243,7 @@ do_install() {
lsb_dist='centos' lsb_dist='centos'
fi fi
if [ -z "$lsb_dist" ] && [ -r /etc/redhat-release ]; then if [ -z "$lsb_dist" ] && [ -r /etc/redhat-release ]; then
# we use centos for both redhat and centos releases lsb_dist='redhat'
lsb_dist='centos'
fi fi
if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then
lsb_dist="$(. /etc/os-release && echo "$ID")" lsb_dist="$(. /etc/os-release && echo "$ID")"
@ -438,6 +437,10 @@ do_install() {
;; ;;
fedora|centos|redhat|oraclelinux) fedora|centos|redhat|oraclelinux)
if [ "${lsb_dist}" = "redhat" ]; then
# we use the centos repository for both redhat and centos releases
lsb_dist='centos'
fi
$sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF $sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF
[docker-${repo}-repo] [docker-${repo}-repo]
name=Docker ${repo} Repository name=Docker ${repo} Repository