diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-02-05 14:29:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-02-05 14:31:38 +0000 |
| commit | c5268eb8041f204620e7f41a357cdcbcfc7bddd4 (patch) | |
| tree | d2b22cdb24e74c1c02ced384ffa27e597871fc61 /testing/docker/openrc-fixes.patch | |
| parent | c46d50039feca3d368b23cf04876ab7bcc5664ea (diff) | |
| download | aports-c5268eb8041f204620e7f41a357cdcbcfc7bddd4.tar.bz2 aports-c5268eb8041f204620e7f41a357cdcbcfc7bddd4.tar.xz | |
community/docker: upgrade to 1.10.0
Diffstat (limited to 'testing/docker/openrc-fixes.patch')
| -rw-r--r-- | testing/docker/openrc-fixes.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/testing/docker/openrc-fixes.patch b/testing/docker/openrc-fixes.patch deleted file mode 100644 index f350daaf93..0000000000 --- a/testing/docker/openrc-fixes.patch +++ /dev/null @@ -1,34 +0,0 @@ -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_pre() { - checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" -+ for i in $disable_grsec; do -+ if [ -e "$grsecdir/$i" ]; then -+ einfo " Disabling $i" -+ 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" |