author | Florian Forster <octo@collectd.org> | |
Fri, 22 Jan 2016 09:53:29 +0000 (10:53 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Fri, 22 Jan 2016 09:53:29 +0000 (10:53 +0100) |
src/collectd.conf.pod | patch | blob | history | |
src/df.c | patch | blob | history |
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 7a66c8188f8182589da12df69cc04e9dbf21ea1e..0eabec7f2bd56e5a8bf7f6a523ce8051a292cd77 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
=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 53bc4a895e1123f0966eb743723cd6c1d607c375..ff701725f42dc80b3084754503966eb0ca5613ab 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;