summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Deziel <simon@sdeziel.info>2018-03-28 15:08:22 +0000
committerLennart Weller <lhw@ring0.de>2018-03-28 15:08:52 +0000
commit18ae58a4eb1f5bb805dff6b4fc25cf2e9162d447 (patch)
tree491ab43d33a2ee88980ffd2da73baab146e6055b
parentPatch: making SEND_EMAILS configurable (diff)
downloadnetdata-18ae58a4eb1f5bb805dff6b4fc25cf2e9162d447.tar.xz
netdata-18ae58a4eb1f5bb805dff6b4fc25cf2e9162d447.zip
Patch: Graceful fallback to suid in container env
-rw-r--r--debian/changelog1
-rw-r--r--debian/netdata.postinst.in3
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7567fb8cb..a5b198751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ netdata (1.10.0+dfsg-1) UNRELEASED; urgency=medium
[ Lennart Weller ]
* Patch by Daniel Baumann to enable SEND_EMAILS configuration (Closes: #888815)
+ * Patch by Simon Deziel to fallback to suid in containers (Closes: #890139)
-- Federico Ceratto <federico@debian.org> Tue, 27 Mar 2018 22:28:59 +0100
diff --git a/debian/netdata.postinst.in b/debian/netdata.postinst.in
index 71cac68a3..edd26b2e8 100644
--- a/debian/netdata.postinst.in
+++ b/debian/netdata.postinst.in
@@ -49,7 +49,8 @@ case "$1" in
fi
chown -R root:netdata /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d
- setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d/apps.plugin
+ setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d/apps.plugin || \
+ chmod 4754 /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d/apps.plugin
chown netdata:adm /var/log/netdata
chmod 02750 /var/log/netdata