mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-23 11:00:25 +00:00
Merge pull request #258 from dsheets/remove-slash-Mac
Remove /Mac in docker init and transfused init
This commit is contained in:
commit
8a84cab8c2
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user