Skip to content

Commit 7d9367a

Browse files
committed
Fix openwrt sysupgrade usage
1 parent 1ba87b2 commit 7d9367a

File tree

4 files changed

+9
-20
lines changed

4 files changed

+9
-20
lines changed

openwrt/net/wfb-ng-full/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ define Package/wfb-ng-full/description
4545
receiver or transmitter with divesity.
4646
endef
4747

48+
define Package/wfb-ng/conffiles
49+
/usr/sbin/wfb-ng.sh
50+
/etc/wifibroadcast.cfg
51+
endef
52+
4853
define Py3Package/wfb-ng-full/install
4954
$(INSTALL_DIR) $(1)/usr/bin
5055
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/

openwrt/net/wfb-ng-full/files/wfb-ng.init

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,11 @@ START=99
44
STOP=10
55

66
USE_PROCD=1
7-
NAME=wfb-ng
87

9-
SYSUPGRADE_CONF="/etc/sysupgrade.conf"
108
WFB_CFG="/etc/wifibroadcast.cfg"
119
WFB_INIT="/usr/sbin/wfb-ng.sh"
1210
WFB_SERVER="/usr/bin/wfb-server --profiles gs --cluster manual"
1311

14-
if [ -f $SYSUPGRADE_CONF ] && [ -x $WFB_INIT ] && ! grep -q $WFB_INIT $SYSUPGRADE_CONF
15-
then
16-
echo $WFB_INIT >> $SYSUPGRADE_CONF
17-
fi
18-
19-
if [ -f $SYSUPGRADE_CONF ] && [ -f $WFB_CFG ] && ! grep -q $WFB_CFG $SYSUPGRADE_CONF
20-
then
21-
echo $WFB_CFG >> $SYSUPGRADE_CONF
22-
fi
23-
2412
start_service() {
2513
# start cluster node
2614
if [ -x $WFB_INIT ]; then

openwrt/net/wfb-ng/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ define Package/wfb-ng/description
3434
standalone receiver or transmitter without diversity.
3535
endef
3636

37+
define Package/wfb-ng/conffiles
38+
/usr/sbin/wfb-ng.sh
39+
endef
40+
3741
define Package/wfb-ng/install
3842
$(INSTALL_DIR) $(1)/usr/bin
3943
$(INSTALL_BIN) $(PKG_BUILD_DIR)/wfb_rx $(1)/usr/bin/

openwrt/net/wfb-ng/files/wfb-ng.init

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,8 @@ START=99
44
STOP=10
55

66
USE_PROCD=1
7-
NAME=wfb-ng
8-
9-
SYSUPGRADE_CONF="/etc/sysupgrade.conf"
107
WFB_INIT="/usr/sbin/wfb-ng.sh"
118

12-
if [ -f $SYSUPGRADE_CONF ] && [ -x $WFB_INIT ] && ! grep -q $WFB_INIT $SYSUPGRADE_CONF
13-
then
14-
echo $WFB_INIT >> $SYSUPGRADE_CONF
15-
fi
16-
179
start_service() {
1810
if [ -x $WFB_INIT ]; then
1911
procd_open_instance wfb-ng

0 commit comments

Comments
 (0)