AWS: Always install aufs module & tools

Clean up the installation of aufs supporting modules & tools, so we
always install both and only install in one place.

Fixes #12855
This commit is contained in:
Justin Santa Barbara 2015-08-18 08:25:14 -04:00
parent 736945faba
commit fba216c7b3

View File

@ -55,12 +55,6 @@ docker_storage=${DOCKER_STORAGE:-aufs}
if [[ ${#block_devices[@]} == 0 ]]; then
echo "No ephemeral block devices found; will use aufs on root"
docker_storage="aufs"
# Install aufs kernel module (for ubuntu)
apt-get install --yes linux-image-extra-$(uname -r)
# Install aufs tools (for debian)
apt-get install --yes aufs-tools
else
echo "Block devices: ${block_devices[@]}"
@ -174,6 +168,9 @@ elif [[ ${docker_storage} == "aufs-nolvm" || ${docker_storage} == "aufs" ]]; the
# Install aufs kernel module
apt-get install --yes linux-image-extra-$(uname -r)
# Install aufs tools
apt-get install --yes aufs-tools
DOCKER_OPTS="${DOCKER_OPTS} -s aufs"
elif [[ ${docker_storage} == "devicemapper" ]]; then
DOCKER_OPTS="${DOCKER_OPTS} -s devicemapper"