github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #200 from justincormack/runlevels

Browse Source 
Fix startup issues
This commit is contained in:
Justin Cormack 2016-06-13 11:51:33 +01:00 committed by GitHub
commit 6625be95a5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
depend() depend()
{ {
after dev need dev syslog
before docker before docker
} }

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

@ -54,7 +54,7 @@ start()
if cat /proc/cmdline | grep -q 'com.docker.driverDir' if cat /proc/cmdline | grep -q 'com.docker.driverDir'
then then
DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')" DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')"
grep -q "osxfs on /var/log" || mount --bind "${DRIVERDIR}/log" /var/log grep -q "osxfs on /var/log" /proc/mounts || mount --bind "${DRIVERDIR}/log" /var/log
fi fi
# same default ulimit as boot2docker; if you want more can set at docker run time # same default ulimit as boot2docker; if you want more can set at docker run time