From 7a2f6b0e7ca28b868c51be40c710bde04d191189b4b7db844ae43545fe81037f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Mon, 10 Jan 2011 15:36:14 +0000
Subject: [PATCH] Accepting request 57725 from home:gladiac:server

OBS-URL: https://build.opensuse.org/request/show/57725
OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=15
---
 redis-initscript.patch | 10 +++++++---
 redis.changes          |  5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/redis-initscript.patch b/redis-initscript.patch
index 73655c1..491acf2 100644
--- a/redis-initscript.patch
+++ b/redis-initscript.patch
@@ -2,7 +2,7 @@ Index: utils/redis_init_script
 ===================================================================
 --- utils/redis_init_script.orig
 +++ utils/redis_init_script
-@@ -1,36 +1,64 @@
+@@ -1,36 +1,69 @@
  #!/bin/sh
 +#
 +# /etc/init.d/redis
@@ -38,9 +38,13 @@ Index: utils/redis_init_script
 -        else
 -                echo -n "Starting Redis server...\n"
 -                $EXEC $CONF
--        fi
++        # Create a pidfile the server can write into.
++        if [ ! -r $PIDFILE ]; then
++            touch $PIDFILE
++            chown redis:redis $PIDFILE
+         fi
 +        echo -n "Starting service Redis "
-+        /sbin/startproc -u redis -g redis -p $PIDFILE -s -e $EXEC $CONF >/dev/null
++        /sbin/startproc -u redis -g redis -p $PIDFILE -s -e $EXEC $CONF >/dev/null 2>&1
 +        rc_status -v
          ;;
      stop)
diff --git a/redis.changes b/redis.changes
index fa75b7f..82c4840 100644
--- a/redis.changes
+++ b/redis.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 10 16:29:31 CET 2011 - asn@cryptomilk.org
+
+- Fixed creation of the pid file.
+
 -------------------------------------------------------------------
 Sun Jan  9 23:28:39 CET 2011 - asn@cynapses.org