From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 4 May 2021 15:48:08 +0000 (+0000)
Subject: collectd: Use libstatgrab for reading disk stats
X-Git-Tag: v2.25-core157~12^2~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86beff5f75a88cebe62f6d629cce3ae3768e231b;p=ipfire-2.x.git

collectd: Use libstatgrab for reading disk stats

Fixes: #12576
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/collectd b/lfs/collectd
index 36b5078686..5e96ddbb38 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -107,6 +107,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch
 	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10-disk-plugin-fields.patch
 	cd $(DIR_APP) && autoupdate -v configure.in
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/collectd-4.10-disk-plugin-fields.patch b/src/patches/collectd-4.10-disk-plugin-fields.patch
new file mode 100644
index 0000000000..4663d9a991
--- /dev/null
+++ b/src/patches/collectd-4.10-disk-plugin-fields.patch
@@ -0,0 +1,13 @@
+diff --git a/src/disk.c b/src/disk.c
+index 4a78f1bd..c6f9e4bd 100644
+--- a/src/disk.c
++++ b/src/disk.c
+@@ -428,7 +428,7 @@ static int disk_read (void)
+ 	IOObjectRelease (disk_list);
+ /* #endif HAVE_IOKIT_IOKITLIB_H */
+ 
+-#elif KERNEL_LINUX
++#elif 0
+ 	FILE *fh;
+ 	char buffer[1024];
+