From de078211b30e13825b596ff4b2798e0fb780551a Mon Sep 17 00:00:00 2001 From: Bilal Amarni Date: Thu, 1 Sep 2016 23:14:12 +0200 Subject: [PATCH] Remove systemd drop-in file on raspbian 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 --- hack/install.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hack/install.sh b/hack/install.sh index 2c7372c991..b054869a70 100644 --- a/hack/install.sh +++ b/hack/install.sh @@ -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