mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

icwmp: align with bbfdm microservice

Browse source
This commit is contained in:
Vivek Kumar Dutta 2024-03-11 18:53:09 +05:30
parent c414fc6259
commit 9bf0b5ff70
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icwmp/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=icwmp PKG_NAME:=icwmp
PKG_VERSION:=9.7.1 PKG_VERSION:=9.7.2
LOCAL_DEV:=0 LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1) 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/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/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/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_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_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 $(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user

3
icwmp/files/etc/init.d/icwmpd
View file

@ -6,11 +6,9 @@ STOP=00
USE_PROCD=1 USE_PROCD=1
PROG="/usr/sbin/icwmpd" PROG="/usr/sbin/icwmpd"
CWMP_INPUT_JSON="/etc/icwmpd/input.json"
. /lib/functions.sh . /lib/functions.sh
. /usr/share/libubox/jshn.sh . /usr/share/libubox/jshn.sh
. /etc/bbfdm/bbfdm_services.sh
include /lib/network include /lib/network
@ -517,7 +515,6 @@ boot() {
} }
start_service() { start_service() {
bbfdm_add_service "bbfdm.cwmp" "${CWMP_INPUT_JSON}"
procd_open_instance icwmp procd_open_instance icwmp

8
icwmp/files/etc/uci-defaults/50_add_icwmp_dm_microservice Normal file
View file

@ -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