diff --git a/icwmp/Makefile b/icwmp/Makefile index c61915141..161ea727c 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=9.7.1 +PKG_VERSION:=9.7.2 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -56,6 +56,7 @@ define Package/icwmp/install $(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/ + $(INSTALL_BIN) ./files/etc/uci-defaults/50_add_icwmp_dm_microservice $(1)/etc/uci-defaults/ $(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp $(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user diff --git a/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd index 605c81346..2d66d31a3 100755 --- a/icwmp/files/etc/init.d/icwmpd +++ b/icwmp/files/etc/init.d/icwmpd @@ -6,11 +6,9 @@ STOP=00 USE_PROCD=1 PROG="/usr/sbin/icwmpd" -CWMP_INPUT_JSON="/etc/icwmpd/input.json" . /lib/functions.sh . /usr/share/libubox/jshn.sh -. /etc/bbfdm/bbfdm_services.sh include /lib/network @@ -517,7 +515,6 @@ boot() { } start_service() { - bbfdm_add_service "bbfdm.cwmp" "${CWMP_INPUT_JSON}" procd_open_instance icwmp diff --git a/icwmp/files/etc/uci-defaults/50_add_icwmp_dm_microservice b/icwmp/files/etc/uci-defaults/50_add_icwmp_dm_microservice new file mode 100644 index 000000000..c605572a5 --- /dev/null +++ b/icwmp/files/etc/uci-defaults/50_add_icwmp_dm_microservice @@ -0,0 +1,8 @@ +#!/bin/sh + +if ! uci -q get bbfdm.icwmpd >/dev/null; then + uci set bbfdm.icwmpd=micro_service + uci set bbfdm.icwmpd.enable=1 + uci set bbfdm.icwmpd.input_json="/etc/icwmpd/input.json" + uci set bbfdm.icwmpd.loglevel=1 +fi