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 36b5078686054f4481d3ef84905a4df166d6345b..5e96ddbb38f9cc9c55863fb1fa33dddb9e04f0d9 100644 (file)
--- 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 (file)
index 0000000..4663d9a
--- /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];
+