From: Robin H. Johnson <robbat2@gentoo.org>
Date: Thu, 12 Oct 2017 20:30:01 +0000 (-0700)
Subject: dev-db/redis: use s-s-d to background, disallow daemonize.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b545fdf6233c35ef3173109dfcd3d0c2b05da205;p=gentoo.git

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
---

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
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