github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 04:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #258 from dsheets/remove-slash-Mac

Browse Source 
Remove /Mac in docker init and transfused init
This commit is contained in:
Justin Cormack 2016-07-11 12:29:06 +01:00 committed by GitHub
commit 8a84cab8c2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/packages/docker/etc/init.d/docker
View File

@ -44,9 +44,9 @@ start()
# shift logs onto host before docker starts # shift logs onto host before docker starts
# busybox reopens its log files every second # 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 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 if ! grep -q "osxfs on /var/log" /proc/mounts ; then
mkdir -p /run/log mkdir -p /run/log
mount -o bind /var/log /run/log mount -o bind /var/log /run/log

2
alpine/packages/transfused/etc/init.d/transfused
View File

@ -6,7 +6,7 @@ start()
{ {
ebegin "Starting FUSE socket passthrough" ebegin "Starting FUSE socket passthrough"
mkdir -p /Mac mkdir -p /host_docker_app
find /tmp -mindepth 1 -delete find /tmp -mindepth 1 -delete
PIDFILE=/var/run/transfused.pid PIDFILE=/var/run/transfused.pid