From 18ae58a4eb1f5bb805dff6b4fc25cf2e9162d447 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 28 Mar 2018 17:08:22 +0200 Subject: Patch: Graceful fallback to suid in container env --- debian/changelog | 1 + debian/netdata.postinst.in | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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 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 -- cgit v1.2.3