p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove systemd drop-in file on raspbian

Browse Source 
It makes systemd integration less intrusive, notably needed for
docker machine (cf. https://github.com/docker/machine/pull/3605).

The default storage driver would now be devicemapper, until the
deb package is updated.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
Upstream-commit: de078211b30e13825b596ff4b2798e0fb780551a
Component: engine
This commit is contained in:
Bilal Amarni
2016-09-01 23:14:12 +02:00
parent 5645fa8e4e
commit 9d1a7feea8
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,11 +396,7 @@ do_install() {
fi
}
if [ "$lsb_dist" = "raspbian" ]; then
# Create Raspbian specific systemd drop-in file, use overlay by default
( set -x; $sh_c "mkdir -p /etc/systemd/system/docker.service.d" )
( set -x; $sh_c "echo '[Service]\nExecStart=\nExecStart=/usr/bin/dockerd --storage-driver overlay -H fd://' > /etc/systemd/system/docker.service.d/overlay.conf" )
else
if [ "$lsb_dist" != "raspbian" ]; then
# aufs is preferred over devicemapper; try to ensure the driver is available.
if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then