diff options
author | Tasos Katsoulas <12612986+tkatsoulas@users.noreply.github.com> | 2023-12-11 16:03:14 +0200 |
---|---|---|
committer | Tasos Katsoulas <12612986+tkatsoulas@users.noreply.github.com> | 2023-12-12 17:25:00 +0200 |
commit | 96c44344b428ad89be409de882939416ad9f3296 (patch) | |
tree | 2a99f908251434d7528053e2c558ddb58bd43e66 | |
parent | 7d07b600f723b5424aa6151c8b66fa448d301395 (diff) |
Change the workflow on how we set the right permissions for perf-plugin (#16558)
* Change the workflow on how we set the right permissions
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
* Add a failsafe in case fail to set the cap_perfmon
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
* add EOF new line
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
* Fix workflow
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
* minor spelling
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
* we made it odyssey
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
* Apply suggestion from code review
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
* Tidy-up postinst script.
---------
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
Co-authored-by: Austin S. Hemmelgarn <austin@netdata.cloud>
(cherry picked from commit e8a12b3b1c8063b50dbff121741a5f6757d57052)
-rw-r--r-- | contrib/debian/netdata-plugin-perf.postinst | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/contrib/debian/netdata-plugin-perf.postinst b/contrib/debian/netdata-plugin-perf.postinst index 76905878ef..aa4f0f8d88 100644 --- a/contrib/debian/netdata-plugin-perf.postinst +++ b/contrib/debian/netdata-plugin-perf.postinst @@ -7,16 +7,10 @@ case "$1" in chown root:netdata /usr/libexec/netdata/plugins.d/perf.plugin chmod 0750 /usr/libexec/netdata/plugins.d/perf.plugin - if capsh --supports=cap_perfmon 2>/dev/null; then - setcap cap_perfmon+ep /usr/libexec/netdata/plugins.d/perf.plugin - ret="$?" - else - setcap cap_sys_admin+ep /usr/libexec/netdata/plugins.d/perf.plugin - ret="$?" - fi - - if [ "${ret}" -ne 0 ]; then - chmod -f 4750 /usr/libexec/netdata/plugins.d/perf.plugin + if ! setcap cap_perfmon+ep /usr/libexec/netdata/plugins.d/perf.plugin 2>/dev/null; then + if ! setcap cap_sys_admin+ep /usr/libexec/netdata/plugins.d/perf.plugin 2>/dev/null; then + chmod -f 4750 /usr/libexec/netdata/plugins.d/perf.plugin + fi fi ;; esac |