[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     b545fdf6233c35ef3173109dfcd3d0c2b05da205
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 20:30:01 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 20:36:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b545fdf6

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

 dev-db/redis/files/redis.initd-5                              | 4 +++-
 dev-db/redis/{redis-3.2.8-r4.ebuild => redis-3.2.8-r5.ebuild} | 0
 dev-db/redis/{redis-4.0.2.ebuild => redis-4.0.2-r1.ebuild}    | 0
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-db/redis/files/redis.initd-5 b/dev-db/redis/files/redis.initd-5
index a567b1e210d..bfeeb6925ec 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
similarity index 100%
rename from dev-db/redis/redis-3.2.8-r4.ebuild
rename to 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
similarity index 100%
rename from dev-db/redis/redis-4.0.2.ebuild
rename to dev-db/redis/redis-4.0.2-r1.ebuild