From: Florian Forster <octo@collectd.org>
Date: Fri, 22 Jan 2016 09:53:29 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1^0
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d5565943cd7ee338e5b750a027faff8115df4c72;hp=6eb5239cb5b9663722e0dabb036e7263696ed5aa;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 7a66c818..0eabec7f 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -4307,6 +4307,18 @@ Default: C<Collectd notify: %s@%s>
 
 =head2 Plugin C<ntpd>
 
+The C<ntpd> plugin collects per-peer ntpd data such as time offset and time
+dispersion.
+
+For talking to B<ntpd>, it mimics what the B<ntpdc> control program does on
+wire - using B<mode 7> specific requests. This mode is deprecated with
+newer B<ntpd> releases (4.2.7p230 and later). For the C<ntpd> plugin to work
+correctly with them, the ntp daemon must be explicitly configured to
+enable B<mode 7> (which is disabled by default). Refer to the I<ntp.conf(5)>
+manual page for details.
+
+Available configuration options for the C<ntpd> plugin:
+
 =over 4
 
 =item B<Host> I<Hostname>
diff --git a/src/df.c b/src/df.c
index 53bc4a89..ff701725 100644
--- a/src/df.c
+++ b/src/df.c
@@ -270,11 +270,7 @@ static int df_read (void)
 		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;