Accepting request 202178 from home:posophe:branches:devel:languages:python

Can someone look at changes ? I think it's good but I'm not sure...

OBS-URL: https://build.opensuse.org/request/show/202178
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=47

rrdcached-systemd-pre

@@ -14,7 +14,7 @@ test -r $RRDCACHED_CONFIG || { echo "$RRDCACHED_CONFIG not existing";
         if [ "$1" = "stop" ]; then exit 0;
         else exit 6; fi; }
 
-RRDCACHED_PID='/var/lib/rrdtool/rrdcached/rrdcached.pid'
+RRDCACHED_PID='/run/rrdcached.pid'
 
 # Read config   
 . $RRDCACHED_CONFIG

rrdcached.service

@@ -19,7 +19,7 @@ EnvironmentFile=-/etc/sysconfig/rrdcached
 ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b "$RRDCACHED_CHROOT_DIR" -p "$RRDCACHED_PID" -l $RRDCACHED_ADDRESS -m $RRDCACHED_SOCKET_MASK -w $RRDCACHED_DISKWRITE -z $RRDCACHED_DELAY -t $RRDCACHED_WRITE_THREADS $RRDCACHED_OPTIONS
 Restart=always
 RestartSec=1
-PIDFile="$RRDCACHED_PID"
+PIDFile=/run/rrdcached.pid
 TimeoutStopSec=10
 
 [Install]

rrdtool.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct  4 17:01:23 UTC 2013 - p.drouand@gmail.com
+
+- Remove PIDfile definition of sysconfig file and add it in systemd
+  service file
+- Fix PIDfile location to /run instead of var/lib/rccached
+
 -------------------------------------------------------------------
 Fri Oct  4 10:40:05 UTC 2013 - obs@botter.cc
 

sysconfig.rrdcached

@@ -103,12 +103,3 @@ RRDCACHED_CHROOT_DIR="/tmp"
 #
 RRDCACHED_OPTIONS=""
 
-## Type:           string
-## Default:        "/var/lib/rrdtool/rrdcached/rrdcached.pid"
-## Config:         rrdcached
-## ServiceRestart: rrdcached
-#
-# PID file location 
-#
-RRDCACHED_PID="/var/lib/rrdtool/rrdcached/rrdcached.pid"
-