From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 12 Jul 2012 17:05:44 +0000 (+0200)
Subject: collectd-core.postinst: Pass --rrd* parameters to migrate-4-5.px.
X-Git-Tag: collectd-5.1.0-3~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e42a00c86e35ab8711266e3504c25818776fdda;p=pkg-collectd.git

collectd-core.postinst: Pass --rrd* parameters to migrate-4-5.px.

… in order to let the script find those binaries/scripts.
---

diff --git a/debian/changelog b/debian/changelog
index 23f2411..093f375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 collectd (5.1.0-3) UNRELEASED; urgency=low
 
-  * debian/patches/migrate-4-5-df.dpatch:
+  * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst:
     - Added patch to fix the migration of 'df' values in migrate-4-5.px;
       thanks to 'markuskaindl' for reporting this on IRC.
+    - Pass --rrdfilter and --rrdtool parameters to migrate-4-5.px in order to
+      let the script find those binaries/scripts.
 
  -- Sebastian Harl <tokkee@debian.org>  Thu, 12 Jul 2012 18:57:04 +0200
 
diff --git a/debian/collectd-core.postinst b/debian/collectd-core.postinst
index 78dc785..b42bc6c 100755
--- a/debian/collectd-core.postinst
+++ b/debian/collectd-core.postinst
@@ -45,7 +45,9 @@ case "$1" in
         if [ "$RET" = "true" ]; then
             cp -a /var/lib/collectd/ /var/backups/collectd-"$2"
             /usr/lib/collectd/utils/migrate-4-5.px \
-                -indir /var/lib/collectd/rrd/ | bash
+                --rrdfilter /usr/lib/collectd/utils/rrd_filter.px \
+                --rrdtool /usr/bin/rrdtool \
+                --indir /var/lib/collectd/rrd/ | bash
         fi
     ;;