summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2017-05-19 12:10:13 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-19 12:10:13 +0000
commitac6f78b6c88ed8975f6555fd85492ec59d3278d0 (patch)
treeb49dc37009432dbea3ab8d473ca6cbdb96706d6d /src
parent5133d0b42c2923f22f94934169843d6fe2e3ded4 (diff)
parentac3a6a319fc2176e2c7cb7eca6c6493d476c6c53 (diff)
Merge "makefile: update collectd Makefile with intel_pmu configuration"
Diffstat (limited to 'src')
-rw-r--r--src/collectd/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 9e4b484c..8fd78940 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -34,6 +34,10 @@ ifeq ($(LIBPQOS_DIR),)
LIBPQOS_DIR = /usr
endif
+XDG_CACHE_HOME_DIR = $(shell echo $$XDG_CACHE_HOME)
+ifeq ($(XDG_CACHE_HOME_DIR),)
+XDG_CACHE_HOME_DIR = $(shell echo $$HOME)
+endif
CONFIG_CMD += --enable-syslog
CONFIG_CMD += --enable-logfile
@@ -66,7 +70,8 @@ force_install:
$(AT)cp $(WORK_DIR)/contrib/systemd.collectd.service /etc/systemd/system/
$(AT)mv /etc/systemd/system/systemd.collectd.service /etc/systemd/system/collectd.service
$(AT)sed -i -e 's/ExecStart=\/usr\/sbin\/collectd/ExecStart=\/opt\/collectd\/sbin\/collectd/g' /etc/systemd/system/collectd.service
- $(AT)sed -i -e 's/CapabilityBoundingSet=/CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SYS_RAWIO/g' /etc/systemd/system/collectd.service
+ $(AT)sed -i -e 's/CapabilityBoundingSet=/CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SYS_RAWIO CAP_SYS_ADMIN/g' /etc/systemd/system/collectd.service
+ $(AT)sed -i -e 's|Environment=\(.*\)|Environment=XDG_CACHE_HOME='$(XDG_CACHE_HOME_DIR)' \1|g' /etc/systemd/system/collectd.service
$(AT)systemctl daemon-reload
$(AT)sudo ./include_config.sh
@echo "Make install done"