summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2017-10-12 13:30:01 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2017-10-12 13:36:58 -0700
commitb545fdf6233c35ef3173109dfcd3d0c2b05da205 (patch)
tree7be349eb278324a4a2e2dfa968f65b96800c93b8
parentsys-kernel/gentoo-sources: Linux patch 4.13.6 (diff)
downloadgentoo-b545fdf6233c35ef3173109dfcd3d0c2b05da205.tar.gz
gentoo-b545fdf6233c35ef3173109dfcd3d0c2b05da205.tar.bz2
gentoo-b545fdf6233c35ef3173109dfcd3d0c2b05da205.zip
dev-db/redis: use s-s-d to background, disallow daemonize.
Bug: https://bugs.gentoo.org/631002#c10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
-rw-r--r--dev-db/redis/files/redis.initd-54
-rw-r--r--dev-db/redis/redis-3.2.8-r5.ebuild (renamed from dev-db/redis/redis-3.2.8-r4.ebuild)0
-rw-r--r--dev-db/redis/redis-4.0.2-r1.ebuild (renamed from dev-db/redis/redis-4.0.2.ebuild)0
3 files changed, 3 insertions, 1 deletions
diff --git a/dev-db/redis/files/redis.initd-5 b/dev-db/redis/files/redis.initd-5
index a567b1e210d8..bfeeb6925ec0 100644
--- a/dev-db/redis/files/redis.initd-5
+++ b/dev-db/redis/files/redis.initd-5
@@ -9,8 +9,10 @@
: ${REDIS_GROUP:=redis}
: ${REDIS_TIMEOUT:=30}
+# https://bugs.gentoo.org/631002#c10
+# Force '--daemonize no' to override the config file
command="/usr/sbin/redis-server"
-command_args="${REDIS_OPTS}"
+command_args="${REDIS_OPTS} --daemonize no"
command_background="true"
command_user="${REDIS_USER}:${REDIS_GROUP}"
pidfile="/run/${RC_SVCNAME}.pid"
diff --git a/dev-db/redis/redis-3.2.8-r4.ebuild b/dev-db/redis/redis-3.2.8-r5.ebuild
index cb1541102b7c..cb1541102b7c 100644
--- a/dev-db/redis/redis-3.2.8-r4.ebuild
+++ b/dev-db/redis/redis-3.2.8-r5.ebuild
diff --git a/dev-db/redis/redis-4.0.2.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild
index 1449a3567826..1449a3567826 100644
--- a/dev-db/redis/redis-4.0.2.ebuild
+++ b/dev-db/redis/redis-4.0.2-r1.ebuild