Adding upstream version 1.40.0.upstream/1.40.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 2 insertions, 45 deletions

diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh
index 1eabde83c..636fb6110 100755
--- a/packaging/makeself/install-or-update.sh
+++ b/packaging/makeself/install-or-update.sh
@@ -62,45 +62,6 @@ if [ ! "${DISABLE_TELEMETRY:-0}" -eq 0 ] ||
   REINSTALL_OPTIONS="${REINSTALL_OPTIONS} --disable-telemetry"
 fi
 
-deleted_stock_configs=0
-if [ ! -f "etc/netdata/.installer-cleanup-of-stock-configs-done" ]; then
-
-  # -----------------------------------------------------------------------------
-  progress "Deleting stock configuration files from user configuration directory"
-
-  declare -A configs_signatures=()
-  source "system/configs.signatures"
-
-  if [ ! -d etc/netdata ]; then
-    run mkdir -p etc/netdata
-  fi
-
-  md5sum="$(command -v md5sum 2> /dev/null || command -v md5 2> /dev/null)"
-  while IFS= read -r -d '' x; do
-    # find it relative filename
-    f="${x/etc\/netdata\//}"
-
-    # find the stock filename
-    t="${f/.conf.old/.conf}"
-    t="${t/.conf.orig/.conf}"
-
-    if [ -n "${md5sum}" ]; then
-      # find the checksum of the existing file
-      md5="$(${md5sum} < "${x}" | cut -d ' ' -f 1)"
-      #echo >&2 "md5: ${md5}"
-
-      # check if it matches
-      if [ "${configs_signatures[${md5}]}" = "${t}" ]; then
-        # it matches the default
-        run rm -f "${x}"
-        deleted_stock_configs=$((deleted_stock_configs + 1))
-      fi
-    fi
-  done < <(find etc -type f)
-
-  touch "etc/netdata/.installer-cleanup-of-stock-configs-done"
-fi
-
 # -----------------------------------------------------------------------------
 progress "Attempt to create user/group netdata/netadata"
 
@@ -196,10 +157,6 @@ dir_should_be_link . var/log/netdata netdata-logs
 
 dir_should_be_link etc/netdata ../../usr/lib/netdata/conf.d orig
 
-if [ ${deleted_stock_configs} -gt 0 ]; then
-  dir_should_be_link etc/netdata ../../usr/lib/netdata/conf.d "000.-.USE.THE.orig.LINK.TO.COPY.AND.EDIT.STOCK.CONFIG.FILES"
-fi
-
 # -----------------------------------------------------------------------------
 progress "fix permissions"
 
@@ -214,6 +171,7 @@ progress "changing plugins ownership and permissions"
 if command -v setcap >/dev/null 2>&1; then
     run setcap "cap_dac_read_search,cap_sys_ptrace=ep" "usr/libexec/netdata/plugins.d/apps.plugin"
     run setcap "cap_dac_read_search=ep" "usr/libexec/netdata/plugins.d/slabinfo.plugin"
+    run setcap "cap_dac_read_search=ep" "usr/libexec/netdata/plugins.d/debugfs.plugin"
 
     if command -v capsh >/dev/null 2>&1 && capsh --supports=cap_perfmon 2>/dev/null ; then
         run setcap "cap_perfmon=ep" "usr/libexec/netdata/plugins.d/perf.plugin"
@@ -223,7 +181,7 @@ if command -v setcap >/dev/null 2>&1; then
 
     run setcap "cap_net_admin,cap_net_raw=eip" "usr/libexec/netdata/plugins.d/go.d.plugin"
 else
-  for x in apps.plugin perf.plugin slabinfo.plugin; do
+  for x in apps.plugin perf.plugin slabinfo.plugin debugfs.plugin; do
     f="usr/libexec/netdata/plugins.d/${x}"
     run chown root:${NETDATA_GROUP} "${f}"
     run chmod 4750 "${f}"
diff --git a/packaging/makeself/jobs/99-makeself.install.sh b/packaging/makeself/jobs/99-makeself.install.sh
index 12bd59b66..aa1acd100 100755
--- a/packaging/makeself/jobs/99-makeself.install.sh
+++ b/packaging/makeself/jobs/99-makeself.install.sh
@@ -28,7 +28,6 @@ run cp \
   packaging/makeself/post-installer.sh \
   packaging/makeself/install-or-update.sh \
   packaging/installer/functions.sh \
-  configs.signatures \
   "${NETDATA_INSTALL_PATH}/system/"
 
 # -----------------------------------------------------------------------------