diff options
| author | Christian Kampka <christian@kampka.net> | 2015-11-03 21:35:02 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-04 10:31:16 +0000 |
| commit | df23000cc49f081b92eaeeef8773da5d50e18746 (patch) | |
| tree | ae3281d752519f0521902c97f72965a3771650b0 /community/docker/openrc-fixes.patch | |
| parent | 5f19b517c0bf397e07f97ed253f56c92f7231cf8 (diff) | |
| download | aports-df23000cc49f081b92eaeeef8773da5d50e18746.tar.bz2 aports-df23000cc49f081b92eaeeef8773da5d50e18746.tar.xz | |
community/docker: new upstream version 1.9.0
Diffstat (limited to 'community/docker/openrc-fixes.patch')
| -rw-r--r-- | community/docker/openrc-fixes.patch | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/community/docker/openrc-fixes.patch b/community/docker/openrc-fixes.patch index 701459910b..f350daaf93 100644 --- a/community/docker/openrc-fixes.patch +++ b/community/docker/openrc-fixes.patch @@ -1,12 +1,14 @@ ---- a/contrib/init/openrc/docker.initd 2015-02-10 17:14:37.000000000 -0100 -+++ b/contrib/init/openrc/docker.initd 2015-03-31 10:17:15.500070311 -0200 -@@ -8,11 +8,18 @@ - DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker} - DOCKER_OPTS=${DOCKER_OPTS:-} - +diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd +index 26fa8ef..ea8a3b2 100644 +--- a/contrib/init/openrc/docker.initd ++++ b/contrib/init/openrc/docker.initd +@@ -9,11 +9,18 @@ DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}" + start_stop_daemon_args="--background \ + --stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\"" + +grsecdir=/proc/sys/kernel/grsecurity + - start() { + start_pre() { checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" + for i in $disable_grsec; do + if [ -e "$grsecdir/$i" ]; then @@ -14,16 +16,17 @@ + echo 0 > "$grsecdir/$i" + fi + done - + ulimit -n 1048576 - ulimit -u 1048576 - - ebegin "Starting docker daemon" - start-stop-daemon --start --background \ + + return 0 + } + --- a/contrib/init/openrc/docker.confd 2015-02-10 17:14:37.000000000 -0100 +++ b/contrib/init/openrc/docker.confd 2015-03-31 14:52:47.323685914 -0200 @@ -11,3 +11,6 @@ - + # any other random options you want to pass to docker DOCKER_OPTS="" + |