Merging upstream version 1.42.0.

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

2 files changed, 20 insertions, 0 deletions

diff --git a/system/edit-config b/system/edit-config
index 96ee82d4f..74f3634c3 100755
--- a/system/edit-config
+++ b/system/edit-config
@@ -57,6 +57,12 @@ is_prefix() {
 }
 
 check_directories() {
+  if [ -f "${script_dir}/.container-hostname" ]; then
+    NETDATA_USER_CONFIG_DIR="${script_dir}"
+    NETDATA_STOCK_CONFIG_DIR="/usr/lib/netdata/conf.d"
+    return
+  fi
+
   if [ -e "${script_dir}/.environment" ]; then
     OLDPATH="${PATH}"
     # shellcheck disable=SC1091
diff --git a/system/netdata-updater.conf b/system/netdata-updater.conf
index 6cf2062a1..09af046be 100644
--- a/system/netdata-updater.conf
+++ b/system/netdata-updater.conf
@@ -5,3 +5,17 @@
 # actually running the update. The default is 3600 (one
 # hour). Most users should not need to change this.
 #NETDATA_UPDATER_JITTER="3600"
+
+# On systems using our native packages, the updater will by default
+# attempt to install optional plugin packages that would be installed by
+# default on clean installs if those packages are supported on the system.
+#
+# This behavior can be disabled on a per-package basis using the below
+# variables. Setting the variable to a value other than 0 will disable
+# the corresponding package (note that you still need to remove the package
+# yourself if you don0t want it, this just controls whether the updater
+# will try to ensure it’s installed or not).
+#
+# NETDATA_NO_SYSTEMD_JOURNAL controls the `netdata-plugin-systemd-journal`
+# package, which provides the systemd journal plugin for Netdata.
+#NETDATA_NO_SYSTEMD_JOURNAL="0"