github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31 from djs55/remove-driverDir

Browse Source 
Remove driverDir, use groupDir
This commit is contained in:
Dave Scott 2016-02-17 15:52:21 +00:00
commit fe94f5992a
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

@ -10,9 +10,9 @@ pidfile="/run/docker.pid"
# future change this to use a hypervisor socket. # future change this to use a hypervisor socket.
DOCKER_OPTS="${DOCKER_OPTS} -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock" DOCKER_OPTS="${DOCKER_OPTS} -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock"
if cat /proc/cmdline | grep -q 'com.docker.driverDir' if cat /proc/cmdline | grep -q 'com.docker.groupDir'
then then
DRIVER="$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')" DRIVER="$(cat /proc/cmdline | sed -e 's/.*com.docker.groupDir="//' -e 's/".*//')"
INET=$(ifconfig eth0 2> /dev/null | grep 'inet addr' | cut -f 2 -d ":" | cut -f 1 -d " ") INET=$(ifconfig eth0 2> /dev/null | grep 'inet addr' | cut -f 2 -d ":" | cut -f 1 -d " ")
[ -d "/Mac/$DRIVER" ] && echo $INET > "/Mac/$DRIVER/ip" [ -d "/Mac/$DRIVER" ] && echo $INET > "/Mac/$DRIVER/ip"
fi fi

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

@ -14,7 +14,7 @@ start()
GROUPDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.groupDir="//' -e 's/".*//')" GROUPDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.groupDir="//' -e 's/".*//')"
mount --bind "${GROUPDIR}" /var/log mount --bind "${GROUPDIR}/log" /var/log
eend $? "Failed to redirect logs to host" eend $? "Failed to redirect logs to host"
} }