docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity

Merge pull request #2306 from tianon/fix-ubuntu-install-aufs

Browse Source 
Update hack/install.sh with some more Ubuntu-specific installation stuff...
Upstream-commit: afaddd04f77b1296ed42a2753d43e59d43d8cc35
Component: engine
This commit is contained in:
Tianon Gravi
2013-10-23 14:22:55 -07:00
parent 40ad755eae 5cdd5ff8f0
commit 6a3e04b0eb
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,16 +75,35 @@ case "$lsb_dist" in
Ubuntu|Debian)
export DEBIAN_FRONTEND=noninteractive
# TODO remove this comment/section once device-mapper lands
echo 'Warning: Docker currently requires AUFS support in the kernel.'
echo 'Please ensure that your kernel includes such support.'
( set -x; sleep 10 )
did_apt_get_update=
apt_get_update() {
if [ -z "$did_apt_get_update" ]; then
( set -x; $sh_c 'sleep 3; apt-get update' )
did_apt_get_update=1
fi
}
# TODO remove this section once device-mapper lands
if ! grep -q aufs /proc/filesystems && ! modprobe aufs; then
kern_extras="linux-image-extra-$(uname -r)"
apt_get_update
( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true
if ! grep -q aufs /proc/filesystems && ! modprobe aufs; then
echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)'
echo >&2 ' but we still have no AUFS. Docker may not work. Proceeding anyways!'
( set -x; sleep 10 )
fi
fi
if [ ! -e /usr/lib/apt/methods/https ]; then
( set -x; $sh_c 'sleep 3; apt-get update; apt-get install -y -q apt-transport-https' )
apt_get_update
( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https' )
fi
if [ -z "$curl" ]; then
( set -x; $sh_c 'sleep 3; apt-get update; apt-get install -y -q curl' )
apt_get_update
( set -x; $sh_c 'sleep 3; apt-get install -y -q curl' )
curl='curl -sL'
fi
(