Merge branch 'collectd-4.10' into collectd-5.0

diff --git a/src/interface.c b/src/interface.c
index 9501161..ea82039 100644 (file)
--- a/src/interface.c
+++ b/src/interface.c
@@ -141,17 +141,11 @@ static int interface_init (void)
        {
                if (strncmp (ksp_chain->ks_class, "net", 3))
                        continue;
-               /* Ignore kstat entry if not the regular statistic set. This
-                * avoids problems with "bogus" interfaces, such as
-                * "wrsmd<num>" */
-               if (strncmp (ksp_chain->ks_name, ksp_chain->ks_module,
-                                       strlen (ksp_chain->ks_module)) != 0)
-                       continue;
                if (ksp_chain->ks_type != KSTAT_TYPE_NAMED)
                        continue;
                if (kstat_read (kc, ksp_chain, NULL) == -1)
                        continue;
-               if ((val = get_kstat_value (ksp_chain, "ifspeed")) == -1LL)
+               if ((val = get_kstat_value (ksp_chain, "obytes")) == -1LL)
                        continue;
                ksp[numif++] = ksp_chain;
        }

diff --git a/version-gen.sh b/version-gen.sh
index 5bc20a1..5eb46de 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 DEFAULT_VERSION="5.0.2.git"