mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #2306 from tianon/fix-ubuntu-install-aufs
Update hack/install.sh with some more Ubuntu-specific installation stuff...
This commit is contained in:
commit
afaddd04f7
1 changed files with 25 additions and 6 deletions
|
@ -75,16 +75,35 @@ case "$lsb_dist" in
|
||||||
Ubuntu|Debian)
|
Ubuntu|Debian)
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
# TODO remove this comment/section once device-mapper lands
|
did_apt_get_update=
|
||||||
echo 'Warning: Docker currently requires AUFS support in the kernel.'
|
apt_get_update() {
|
||||||
echo 'Please ensure that your kernel includes such support.'
|
if [ -z "$did_apt_get_update" ]; then
|
||||||
( set -x; sleep 10 )
|
( 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
|
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
|
fi
|
||||||
if [ -z "$curl" ]; then
|
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'
|
curl='curl -sL'
|
||||||
fi
|
fi
|
||||||
(
|
(
|
||||||
|
|
Loading…
Reference in a new issue