Skip to contentSkip to conversation

collectd: Fix typo

PATCH New Maxime Hadjinlian 2 participants 3 messages Feb 21, 2016

lore
Share & tools
lore

Maxime Hadjinlian

author
#0 lore raw

PATCH 1/2 collectd: Fix typo

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/collectd/collectd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/collectd/collectd.mk +1 -1
index 06c5389..eb66f25 100644
@@ -16,7 +16,7 @@ COLLECTD_LICENSE_FILES = COPYING
 COLLECTD_PLUGINS_DISABLE = \
 	amqp apple_sensors aquaero ascent barometer dbi email \
 	gmond hddtemp ipmi java libvirt lpar lvm madwifi mbmon \
-	mic multimeter netapp  notify_desktop notify_email numa \
+	mic multimeter netapp notify_desktop notify_email numa \
 	nut onewire oracle perl pf pinba powerdns python redis routeros \
 	rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
 	tokyotyrant turbostat uuid varnish virt vserver write_kafka \
Signature · 1 line
2.7.0
author
#1 lore raw

PATCH 2/2 collectd: Add service file

The service file was taken from Debian.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/collectd/collectd.mk      |  8 ++++++++
 package/collectd/collectd.service | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 package/collectd/collectd.service
package/collectd/collectd.mk +8 -0
index eb66f25..78e24b8 100644
@@ -185,4 +185,12 @@ define COLLECTD_INSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf
 endef
 
+define COLLECTD_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/collectd/collectd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/collectd.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -fs ../../../../usr/lib/systemd/system/collectd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/collectd.service
+endef
+
 $(eval $(autotools-package))
package/collectd/collectd.service new file +17 -0
new file mode 100644
index 0000000..e203806
@@ -0,0 +1,17 @@
+[Unit]
+Description=Statistics collection and monitoring daemon
+After=local-fs.target network.target
+Requires=local-fs.target network.target
+ConditionPathExists=/etc/collectd.conf
+
+[Service]
+Type=notify
+NotifyAccess=main
+EnvironmentFile=-/etc/default/collectd
+ExecStartPre=/usr/sbin/collectd -t
+ExecStart=/usr/sbin/collectd
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
Signature · 1 line
2.7.0
#2 lore raw

PATCH 1/2 collectd: Fix typo

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

Quoted 4 lines · Maxime Hadjinlian
Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/collectd/collectd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Both patches applied to next, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com