summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e68993d)
raw | patch | inline | side by side (parent: e68993d)
author | Marc Fournier <marc.fournier@camptocamp.com> | |
Mon, 18 Jan 2016 15:44:52 +0000 (16:44 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Fri, 22 Jan 2016 09:38:08 +0000 (10:38 +0100) |
3512bb1 added code to skip duplicate reporting of `rootfs` mounted on `/`.
f9c1c5b and f0398d0 added generic code to skip any volume mounted twice.
Depending on the order of the entries in `/etc/mtab`, reporting for `/` was
entirely skipped.
This patch basically reverts the first, non-generic patch, as it's
superseded by the 2 others.
Fixes #1402
Signed-off-by: Florian Forster <octo@collectd.org>
f9c1c5b and f0398d0 added generic code to skip any volume mounted twice.
Depending on the order of the entries in `/etc/mtab`, reporting for `/` was
entirely skipped.
This patch basically reverts the first, non-generic patch, as it's
superseded by the 2 others.
Fixes #1402
Signed-off-by: Florian Forster <octo@collectd.org>
src/df.c | patch | blob | history |
diff --git a/src/df.c b/src/df.c
index d99af4bb2d4cffd7b25df3aa6f8ed2704206a4b0..f3bc7e4267eb5151eb02cab049e16be3842eff29 100644 (file)
--- a/src/df.c
+++ b/src/df.c
else
{
if (strcmp (mnt_ptr->dir, "/") == 0)
- {
- if (strcmp (mnt_ptr->type, "rootfs") == 0)
- continue;
sstrncpy (disk_name, "root", sizeof (disk_name));
- }
else
{
int i, len;