Browse Source

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>
lilik-openwrt-22.03
Florian Eckert 5 years ago
parent
commit
6c64f8f4ba
2 changed files with 2 additions and 3 deletions
  1. +1
    -1
      utils/collectd/Makefile
  2. +1
    -2
      utils/collectd/files/collectd.init

+ 1
- 1
utils/collectd/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=5.9.0 PKG_VERSION:=5.9.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://collectd.org/files/ \ PKG_SOURCE_URL:=https://collectd.org/files/ \


+ 1
- 2
utils/collectd/files/collectd.init View File

@ -1,8 +1,6 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2006-2016 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
. "/usr/share/libubox/jshn.sh"
START=80 START=80
STOP=10 STOP=10
@ -62,6 +60,7 @@ process_generic() {
local config="" local config=""
. /usr/share/libubox/jshn.sh
json_init json_init
json_load_file "$json" json_load_file "$json"


Loading…
Cancel
Save