From 6c64f8f4ba843193b75d14125e3abed8b06828c3 Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Wed, 3 Jul 2019 10:08:44 +0200
Subject: [PATCH] collectd: move jshn.sh include to remove warning

Redmine-patch-id: 3680
If I build an image with the imagebuilder I get the following output
during image building:

../root-x86/etc/init.d/collectd: line 4: /usr/share/libubox/jshn.sh:
No such file or directory

To remove this messsage move include to the needed postion, so that the
message does not occur during image building on the host system anymore.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 utils/collectd/Makefile            | 2 +-
 utils/collectd/files/collectd.init | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 6e621b7b8..b1f26cf54 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
 PKG_VERSION:=5.9.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://collectd.org/files/ \
diff --git a/utils/collectd/files/collectd.init b/utils/collectd/files/collectd.init
index a0029267a..7b9c4623e 100644
--- a/utils/collectd/files/collectd.init
+++ b/utils/collectd/files/collectd.init
@@ -1,8 +1,6 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006-2016 OpenWrt.org
 
-. "/usr/share/libubox/jshn.sh"
-
 START=80
 STOP=10
 
@@ -62,6 +60,7 @@ process_generic() {
 
 	local config=""
 
+	. /usr/share/libubox/jshn.sh
 	json_init
 	json_load_file "$json"