kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #2364 from tianon/sudo-modprobe 

Fix install.sh with $sh_c to get sudo/su for modprobe
This commit is contained in:
Tianon Gravi 2013-10-24 11:24:23 -07:00
parent 489c370fcc 0324e567ad
commit 98c94dd4db
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/install.sh
View File

@ -84,13 +84,13 @@ case "$lsb_dist" in
}
# TODO remove this section once device-mapper lands
if ! grep -q aufs /proc/filesystems && ! modprobe aufs; then
if ! grep -q aufs /proc/filesystems && ! $sh_c '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
if ! grep -q aufs /proc/filesystems && ! $sh_c '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 )