From 8473eb56f251bebc90f2b2afd7b8181f5a3f9231 Mon Sep 17 00:00:00 2001 From: David Sheets Date: Fri, 8 Jul 2016 14:36:26 -0700 Subject: [PATCH] Remove /Mac in docker init and transfused init Replace /Mac with /host_docker_app and replace driverDir with just driver. Signed-off-by: David Sheets --- alpine/packages/docker/etc/init.d/docker | 4 ++-- alpine/packages/transfused/etc/init.d/transfused | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 6d0b7c15d..e8d8984f7 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -44,9 +44,9 @@ start() # shift logs onto host before docker starts # busybox reopens its log files every second - if cat /proc/cmdline | grep -q 'com.docker.driverDir' + if cat /proc/cmdline | grep -q 'com.docker.driver' then - DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')" + DRIVERDIR="/host_docker_app/$(cat /proc/cmdline | sed -e 's/.*com.docker.driver="//' -e 's/".*//')" if ! grep -q "osxfs on /var/log" /proc/mounts ; then mkdir -p /run/log mount -o bind /var/log /run/log diff --git a/alpine/packages/transfused/etc/init.d/transfused b/alpine/packages/transfused/etc/init.d/transfused index 7e60c4521..4cad75fcf 100755 --- a/alpine/packages/transfused/etc/init.d/transfused +++ b/alpine/packages/transfused/etc/init.d/transfused @@ -6,7 +6,7 @@ start() { ebegin "Starting FUSE socket passthrough" - mkdir -p /Mac + mkdir -p /host_docker_app find /tmp -mindepth 1 -delete PIDFILE=/var/run/transfused.pid