aboutsummaryrefslogtreecommitdiffstats
path: root/community/docker/docker-openrc-fixes.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-09-14 15:03:37 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-09-14 15:03:37 +0000
commit42737101590cb4129c055e495e7b454460305270 (patch)
tree891118f8b0aa2a6135403a78f63908c73541fb2b /community/docker/docker-openrc-fixes.patch
parentdf6821feaf2cf3c3da4a496525469ca67301d347 (diff)
downloadaports-42737101590cb4129c055e495e7b454460305270.tar.gz
aports-42737101590cb4129c055e495e7b454460305270.tar.bz2
aports-42737101590cb4129c055e495e7b454460305270.tar.xz
community/docker: make docker service depend on sysfs
ref #6038
Diffstat (limited to 'community/docker/docker-openrc-fixes.patch')
-rw-r--r--community/docker/docker-openrc-fixes.patch35
1 files changed, 20 insertions, 15 deletions
diff --git a/community/docker/docker-openrc-fixes.patch b/community/docker/docker-openrc-fixes.patch
index f350daaf93..cd6f99cb3a 100644
--- a/community/docker/docker-openrc-fixes.patch
+++ b/community/docker/docker-openrc-fixes.patch
@@ -1,13 +1,28 @@
+diff --git a/contrib/init/openrc/docker.confd b/contrib/init/openrc/docker.confd
+index 2444031..b5f431c 100644
+--- a/contrib/init/openrc/docker.confd
++++ b/contrib/init/openrc/docker.confd
+@@ -11,3 +11,6 @@
+
+ # any other random options you want to pass to docker
+ DOCKER_OPTS=""
++
++# disable grsecurity features
++#disable_grsec="chroot_deny_chmod chroot_deny_mknod"
diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd
-index 26fa8ef..ea8a3b2 100644
+index f2e1536..20de85b 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}"
+@@ -9,11 +9,22 @@ 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
+
++depend() {
++ need sysfs
++}
++
start_pre() {
checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
+ for i in $disable_grsec; do
@@ -16,19 +31,9 @@ index 26fa8ef..ea8a3b2 100644
+ echo 0 > "$grsecdir/$i"
+ fi
+ done
-
+
ulimit -n 1048576
- ulimit -u 1048576
-
+
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=""
-+
-+# disable grsecurity features
-+#disable_grsec="chroot_deny_chmod chroot_deny_mknod"