From 268367c7a8f250da79f6bf4745939da525e75842 Mon Sep 17 00:00:00 2001
From: Jose Garcia <joseeduardo.garcia@rockabox.com>
Date: Thu, 1 Oct 2015 16:06:44 +0100
Subject: [PATCH] Support Collectd 5.5 and above

More info: https://github.com/collectd/collectd/commit/ff270e6d53374bddca9f3fe0bb7a8c2294548edc
---
 templates/upstart.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/upstart.conf.j2 b/templates/upstart.conf.j2
index e3860dc..47bd931 100644
--- a/templates/upstart.conf.j2
+++ b/templates/upstart.conf.j2
@@ -8,7 +8,11 @@ stop on runlevel [!2345]
 env DAEMON={{collectd_prefix_sbin}}/collectd
 
 # Tell upstart to watch for forking when tracking the pid for us.
+{% if collectd_version | version_compare('5.5.0', '>=') %}
+expect stop
+{% else %}
 expect fork
+{% endif %}
 
 # prevent thrashing - 10 restarts in 5 seconds
 respawn