Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
| ... | ... |
@@ -103,7 +103,7 @@ case "$lsb_dist" in |
| 103 | 103 |
|
| 104 | 104 |
Ubuntu|Debian) |
| 105 | 105 |
export DEBIAN_FRONTEND=noninteractive |
| 106 |
- |
|
| 106 |
+ |
|
| 107 | 107 |
did_apt_get_update= |
| 108 | 108 |
apt_get_update() {
|
| 109 | 109 |
if [ -z "$did_apt_get_update" ]; then |
| ... | ... |
@@ -111,21 +111,21 @@ case "$lsb_dist" in |
| 111 | 111 |
did_apt_get_update=1 |
| 112 | 112 |
fi |
| 113 | 113 |
} |
| 114 |
- |
|
| 114 |
+ |
|
| 115 | 115 |
# aufs is preferred over devicemapper; try to ensure the driver is available. |
| 116 | 116 |
if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then |
| 117 | 117 |
kern_extras="linux-image-extra-$(uname -r)" |
| 118 |
- |
|
| 118 |
+ |
|
| 119 | 119 |
apt_get_update |
| 120 | 120 |
( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true |
| 121 |
- |
|
| 121 |
+ |
|
| 122 | 122 |
if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then |
| 123 | 123 |
echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)' |
| 124 | 124 |
echo >&2 ' but we still have no AUFS. Docker may not work. Proceeding anyways!' |
| 125 | 125 |
( set -x; sleep 10 ) |
| 126 | 126 |
fi |
| 127 | 127 |
fi |
| 128 |
- |
|
| 128 |
+ |
|
| 129 | 129 |
if [ ! -e /usr/lib/apt/methods/https ]; then |
| 130 | 130 |
apt_get_update |
| 131 | 131 |
( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https' ) |
| ... | ... |
@@ -165,7 +165,7 @@ case "$lsb_dist" in |
| 165 | 165 |
echo |
| 166 | 166 |
exit 0 |
| 167 | 167 |
;; |
| 168 |
- |
|
| 168 |
+ |
|
| 169 | 169 |
Gentoo) |
| 170 | 170 |
if [ "$url" = "https://test.docker.io/" ]; then |
| 171 | 171 |
echo >&2 |
| ... | ... |
@@ -180,7 +180,7 @@ case "$lsb_dist" in |
| 180 | 180 |
echo >&2 |
| 181 | 181 |
exit 1 |
| 182 | 182 |
fi |
| 183 |
- |
|
| 183 |
+ |
|
| 184 | 184 |
( |
| 185 | 185 |
set -x |
| 186 | 186 |
$sh_c 'sleep 3; emerge app-emulation/docker' |