@cryptotaxi247 / netdata-1 / commits / b8c7ae6c8

build: setuid apps.plugin if running under root

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

Alon Bar-Lev committed Nov 16, 2015 at 00:46 UTC b8c7ae6c81d78089728c64b9835b0de82121af3b
2 files changed +12 -8
netdata.spec.in
-1
@@ -45,7 +45,6 @@ make %{?_smp_mflags} install DESTDIR="%{buildroot}"
45 find "%{buildroot}" -name .keep -exec rm {} \;
46
47 %files
48 -%attr(4755, root, root) %{_libexecdir}/%{name}/plugins.d/apps.plugin
48 %attr(-, netdata, netdata) %dir %{_localstatedir}/cache/%{name}/
49 %attr(-, netdata, netdata) %dir %{_localstatedir}/log/%{name}/
50 %{_bindir}/%{name}
src/Makefile.am
+12 -7
@@ -73,10 +73,15 @@ apps_plugin_SOURCES = \
73 procfile.c procfile.h \
74 $(NULL)
75
76 -install-data-hook:
77 - @echo
78 - @echo "ATTENTION"
79 - @echo
80 - @echo "setuid bit of $(pluginsdir)/apps.plugin must be set, please execute as root:"
81 - @echo "chown root '$(pluginsdir)/apps.plugin' && chmod 4755 '$(pluginsdir)/apps.plugin'"
82 - @echo
76 +install-exec-hook:
77 + if [ `id -u` == 0 ]; then \
78 + chown root '$(DESTDIR)$(pluginsdir)/apps.plugin' && \
79 + chmod 4755 '$(DESTDIR)$(pluginsdir)/apps.plugin'; \
80 + else \
81 + echo; \
82 + echo "ATTENTION"; \
83 + echo; \
84 + echo "setuid bit of $(pluginsdir)/apps.plugin must be set, please execute as root:"; \
85 + echo "chown root '$(pluginsdir)/apps.plugin' && chmod 4755 '$(pluginsdir)/apps.plugin'"; \
86 + echo; \
87 + fi