Hello community,
here is the log from the commit of package rrdtool for openSUSE:Factory checked
in at 2014-02-15 17:18:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
and /work/SRC/openSUSE:Factory/.rrdtool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rrdtool"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes 2014-01-23
15:55:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2014-02-15
17:18:04.000000000 +0100
@@ -1,0 +2,8 @@
+Sun Feb 9 08:58:51 UTC 2014 - o...@botter.cc
+
+- again fix PIDfile handling for rrdcached in systemd file
+ (ugly now: because of removal of declaration in sysconfig file;
+ it has to be declared twice in service file)
+- add PIDfile directory using tmpfiles now
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rrdtool.spec ++++++
--- /var/tmp/diff_new_pack.D4ctMp/_old 2014-02-15 17:18:05.000000000 +0100
+++ /var/tmp/diff_new_pack.D4ctMp/_new 2014-02-15 17:18:05.000000000 +0100
@@ -16,6 +16,8 @@
#
+%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
+
Name: rrdtool
BuildRequires: autoconf
BuildRequires: automake
@@ -243,7 +245,9 @@
# install systemd specific files
install -Dm755 %{SOURCE4}
%{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pre
install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service
-mkdir -p %{buildroot}%{_localstatedir}/lib/rrdtool/rrdcached
+install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
+echo "d /run/rrdcached 0755 %{rrdcached_user} %{rrdcached_group}" >
%{buildroot}/%{_tmpfilesdir}/rrdcached.conf
+chmod 644 %{buildroot}/%{_tmpfilesdir}/rrdcached.conf
%post -p /sbin/ldconfig
@@ -296,11 +300,10 @@
%defattr(-, root, root)
%{_bindir}/rrdcached
%{_localstatedir}/adm/fillup-templates/sysconfig.rrdcached
-%dir %{_localstatedir}/lib/rrdtool
-%attr(-,%rrdcached_user,%rrdcached_group) %dir
%{_localstatedir}/lib/rrdtool/rrdcached
%{_datadir}/rrdcached
%{_datadir}/rrdcached/rrdcached-systemd-pre
%{_unitdir}/rrdcached.service
+%{_tmpfilesdir}/rrdcached.conf
%pre cached
getent group %rrdcached_group >/dev/null || groupadd %rrdcached_group
@@ -310,6 +313,7 @@
%post cached
%service_add_post rrdcached.service
%fillup_only rrdcached
+systemd-tmpfiles --create %{_tmpfilesdir}/rrdcached.conf
%preun cached
%service_del_preun rrdcached.service
++++++ rrdcached-systemd-pre ++++++
--- /var/tmp/diff_new_pack.D4ctMp/_old 2014-02-15 17:18:05.000000000 +0100
+++ /var/tmp/diff_new_pack.D4ctMp/_new 2014-02-15 17:18:05.000000000 +0100
@@ -14,8 +14,6 @@
if [ "$1" = "stop" ]; then exit 0;
else exit 6; fi; }
-RRDCACHED_PID='/run/rrdcached.pid'
-
# Read config
. $RRDCACHED_CONFIG
@@ -24,8 +22,6 @@
test -d "$DIR" || mkdir -p "$DIR"
}
-check_and_create_dir "$(dirname $RRDCACHED_PID)"
-chown $RRDCACHED_USER:$RRDCACHED_GROUP "$(dirname $RRDCACHED_PID)"
case "$RRDCACHED_ADDRESS" in
^unix:)
SOCKETDIR=$(dirname ${RRDCACHED_ADDRESS/unix:/})
++++++ rrdcached.service ++++++
--- /var/tmp/diff_new_pack.D4ctMp/_old 2014-02-15 17:18:05.000000000 +0100
+++ /var/tmp/diff_new_pack.D4ctMp/_new 2014-02-15 17:18:05.000000000 +0100
@@ -16,10 +16,10 @@
ExecStartPre=-/bin/echo 'Starting RRD data caching service (rrdtools -
rrdcached)'
ExecStartPre=/bin/sh -c "/usr/share/rrdcached/rrdcached-systemd-pre"
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
+ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b "$RRDCACHED_CHROOT_DIR" -p
/run/rrdcached/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=/run/rrdcached.pid
+PIDFile=/run/rrdcached/rrdcached.pid
TimeoutStopSec=10
[Install]
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
