Skip to content

Commit 0014243

Browse files
smallprogramsmallprogram
committed
Merge remote-tracking branch 'origin/main' into temp-openwrt
2 parents 37edd79 + 69f84a1 commit 0014243

File tree

16 files changed

+48
-16
lines changed

16 files changed

+48
-16
lines changed

‎config/leanlede_config/H28K.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5205,7 +5205,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52055205
# CONFIG_PACKAGE_luci-mod-rpc is not set
52065206
CONFIG_PACKAGE_luci-mod-status=y
52075207
CONFIG_PACKAGE_luci-mod-system=y
5208-
# CONFIG_PACKAGE_luci-newapi is not set
52095208
# end of 2. Modules
52105209

52115210
#
@@ -5523,6 +5522,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55235522
# CONFIG_PACKAGE_luci-proto-nebula is not set
55245523
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55255524
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5525+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55265526
CONFIG_PACKAGE_luci-proto-ppp=y
55275527
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55285528
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7258,6 +7258,8 @@ CONFIG_PACKAGE_libipset=y
72587258
# CONFIG_PACKAGE_mbusd is not set
72597259
# CONFIG_PACKAGE_memcached is not set
72607260
# CONFIG_PACKAGE_mentohust is not set
7261+
# CONFIG_PACKAGE_mihomo-alpha is not set
7262+
CONFIG_PACKAGE_mihomo-meta=y
72617263
# CONFIG_PACKAGE_mii-tool is not set
72627264
# CONFIG_PACKAGE_mikrotik-btest is not set
72637265
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/H29K.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5215,7 +5215,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52155215
# CONFIG_PACKAGE_luci-mod-rpc is not set
52165216
CONFIG_PACKAGE_luci-mod-status=y
52175217
CONFIG_PACKAGE_luci-mod-system=y
5218-
# CONFIG_PACKAGE_luci-newapi is not set
52195218
# end of 2. Modules
52205219

52215220
#
@@ -5533,6 +5532,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55335532
# CONFIG_PACKAGE_luci-proto-nebula is not set
55345533
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55355534
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5535+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55365536
CONFIG_PACKAGE_luci-proto-ppp=y
55375537
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55385538
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7272,6 +7272,8 @@ CONFIG_PACKAGE_libipset=y
72727272
# CONFIG_PACKAGE_mbusd is not set
72737273
# CONFIG_PACKAGE_memcached is not set
72747274
# CONFIG_PACKAGE_mentohust is not set
7275+
# CONFIG_PACKAGE_mihomo-alpha is not set
7276+
CONFIG_PACKAGE_mihomo-meta=y
72757277
# CONFIG_PACKAGE_mii-tool is not set
72767278
# CONFIG_PACKAGE_mikrotik-btest is not set
72777279
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/H66K.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5225,7 +5225,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52255225
# CONFIG_PACKAGE_luci-mod-rpc is not set
52265226
CONFIG_PACKAGE_luci-mod-status=y
52275227
CONFIG_PACKAGE_luci-mod-system=y
5228-
# CONFIG_PACKAGE_luci-newapi is not set
52295228
# end of 2. Modules
52305229

52315230
#
@@ -5543,6 +5542,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55435542
# CONFIG_PACKAGE_luci-proto-nebula is not set
55445543
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55455544
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5545+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55465546
CONFIG_PACKAGE_luci-proto-ppp=y
55475547
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55485548
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7282,6 +7282,8 @@ CONFIG_PACKAGE_libipset=y
72827282
# CONFIG_PACKAGE_mbusd is not set
72837283
# CONFIG_PACKAGE_memcached is not set
72847284
# CONFIG_PACKAGE_mentohust is not set
7285+
# CONFIG_PACKAGE_mihomo-alpha is not set
7286+
CONFIG_PACKAGE_mihomo-meta=y
72857287
# CONFIG_PACKAGE_mii-tool is not set
72867288
# CONFIG_PACKAGE_mikrotik-btest is not set
72877289
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/H68K.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5225,7 +5225,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52255225
# CONFIG_PACKAGE_luci-mod-rpc is not set
52265226
CONFIG_PACKAGE_luci-mod-status=y
52275227
CONFIG_PACKAGE_luci-mod-system=y
5228-
# CONFIG_PACKAGE_luci-newapi is not set
52295228
# end of 2. Modules
52305229

52315230
#
@@ -5543,6 +5542,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55435542
# CONFIG_PACKAGE_luci-proto-nebula is not set
55445543
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55455544
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5545+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55465546
CONFIG_PACKAGE_luci-proto-ppp=y
55475547
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55485548
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7282,6 +7282,8 @@ CONFIG_PACKAGE_libipset=y
72827282
# CONFIG_PACKAGE_mbusd is not set
72837283
# CONFIG_PACKAGE_memcached is not set
72847284
# CONFIG_PACKAGE_mentohust is not set
7285+
# CONFIG_PACKAGE_mihomo-alpha is not set
7286+
CONFIG_PACKAGE_mihomo-meta=y
72857287
# CONFIG_PACKAGE_mii-tool is not set
72867288
# CONFIG_PACKAGE_mikrotik-btest is not set
72877289
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/H69K.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5233,7 +5233,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52335233
# CONFIG_PACKAGE_luci-mod-rpc is not set
52345234
CONFIG_PACKAGE_luci-mod-status=y
52355235
CONFIG_PACKAGE_luci-mod-system=y
5236-
# CONFIG_PACKAGE_luci-newapi is not set
52375236
# end of 2. Modules
52385237

52395238
#
@@ -5551,6 +5550,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55515550
# CONFIG_PACKAGE_luci-proto-nebula is not set
55525551
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55535552
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5553+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55545554
CONFIG_PACKAGE_luci-proto-ppp=y
55555555
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55565556
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7290,6 +7290,8 @@ CONFIG_PACKAGE_libipset=y
72907290
# CONFIG_PACKAGE_mbusd is not set
72917291
# CONFIG_PACKAGE_memcached is not set
72927292
# CONFIG_PACKAGE_mentohust is not set
7293+
# CONFIG_PACKAGE_mihomo-alpha is not set
7294+
CONFIG_PACKAGE_mihomo-meta=y
72937295
# CONFIG_PACKAGE_mii-tool is not set
72947296
# CONFIG_PACKAGE_mikrotik-btest is not set
72957297
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/R2S.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5207,7 +5207,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52075207
# CONFIG_PACKAGE_luci-mod-rpc is not set
52085208
CONFIG_PACKAGE_luci-mod-status=y
52095209
CONFIG_PACKAGE_luci-mod-system=y
5210-
# CONFIG_PACKAGE_luci-newapi is not set
52115210
# end of 2. Modules
52125211

52135212
#
@@ -5525,6 +5524,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55255524
# CONFIG_PACKAGE_luci-proto-nebula is not set
55265525
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55275526
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5527+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55285528
CONFIG_PACKAGE_luci-proto-ppp=y
55295529
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55305530
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7260,6 +7260,8 @@ CONFIG_PACKAGE_libipset=y
72607260
# CONFIG_PACKAGE_mbusd is not set
72617261
# CONFIG_PACKAGE_memcached is not set
72627262
# CONFIG_PACKAGE_mentohust is not set
7263+
# CONFIG_PACKAGE_mihomo-alpha is not set
7264+
CONFIG_PACKAGE_mihomo-meta=y
72637265
# CONFIG_PACKAGE_mii-tool is not set
72647266
# CONFIG_PACKAGE_mikrotik-btest is not set
72657267
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/R3S.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5207,7 +5207,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52075207
# CONFIG_PACKAGE_luci-mod-rpc is not set
52085208
CONFIG_PACKAGE_luci-mod-status=y
52095209
CONFIG_PACKAGE_luci-mod-system=y
5210-
# CONFIG_PACKAGE_luci-newapi is not set
52115210
# end of 2. Modules
52125211

52135212
#
@@ -5525,6 +5524,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55255524
# CONFIG_PACKAGE_luci-proto-nebula is not set
55265525
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55275526
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5527+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55285528
CONFIG_PACKAGE_luci-proto-ppp=y
55295529
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55305530
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7260,6 +7260,8 @@ CONFIG_PACKAGE_libipset=y
72607260
# CONFIG_PACKAGE_mbusd is not set
72617261
# CONFIG_PACKAGE_memcached is not set
72627262
# CONFIG_PACKAGE_mentohust is not set
7263+
# CONFIG_PACKAGE_mihomo-alpha is not set
7264+
CONFIG_PACKAGE_mihomo-meta=y
72637265
# CONFIG_PACKAGE_mii-tool is not set
72647266
# CONFIG_PACKAGE_mikrotik-btest is not set
72657267
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/R4S.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5207,7 +5207,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52075207
# CONFIG_PACKAGE_luci-mod-rpc is not set
52085208
CONFIG_PACKAGE_luci-mod-status=y
52095209
CONFIG_PACKAGE_luci-mod-system=y
5210-
# CONFIG_PACKAGE_luci-newapi is not set
52115210
# end of 2. Modules
52125211

52135212
#
@@ -5525,6 +5524,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55255524
# CONFIG_PACKAGE_luci-proto-nebula is not set
55265525
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55275526
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5527+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55285528
CONFIG_PACKAGE_luci-proto-ppp=y
55295529
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55305530
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7260,6 +7260,8 @@ CONFIG_PACKAGE_libipset=y
72607260
# CONFIG_PACKAGE_mbusd is not set
72617261
# CONFIG_PACKAGE_memcached is not set
72627262
# CONFIG_PACKAGE_mentohust is not set
7263+
# CONFIG_PACKAGE_mihomo-alpha is not set
7264+
CONFIG_PACKAGE_mihomo-meta=y
72637265
# CONFIG_PACKAGE_mii-tool is not set
72647266
# CONFIG_PACKAGE_mikrotik-btest is not set
72657267
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/R4SE.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5207,7 +5207,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52075207
# CONFIG_PACKAGE_luci-mod-rpc is not set
52085208
CONFIG_PACKAGE_luci-mod-status=y
52095209
CONFIG_PACKAGE_luci-mod-system=y
5210-
# CONFIG_PACKAGE_luci-newapi is not set
52115210
# end of 2. Modules
52125211

52135212
#
@@ -5525,6 +5524,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55255524
# CONFIG_PACKAGE_luci-proto-nebula is not set
55265525
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55275526
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5527+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55285528
CONFIG_PACKAGE_luci-proto-ppp=y
55295529
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55305530
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7260,6 +7260,8 @@ CONFIG_PACKAGE_libipset=y
72607260
# CONFIG_PACKAGE_mbusd is not set
72617261
# CONFIG_PACKAGE_memcached is not set
72627262
# CONFIG_PACKAGE_mentohust is not set
7263+
# CONFIG_PACKAGE_mihomo-alpha is not set
7264+
CONFIG_PACKAGE_mihomo-meta=y
72637265
# CONFIG_PACKAGE_mii-tool is not set
72647266
# CONFIG_PACKAGE_mikrotik-btest is not set
72657267
# CONFIG_PACKAGE_mini_snmpd is not set

‎config/leanlede_config/R5C.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5207,7 +5207,6 @@ CONFIG_PACKAGE_luci-mod-network=y
52075207
# CONFIG_PACKAGE_luci-mod-rpc is not set
52085208
CONFIG_PACKAGE_luci-mod-status=y
52095209
CONFIG_PACKAGE_luci-mod-system=y
5210-
# CONFIG_PACKAGE_luci-newapi is not set
52115210
# end of 2. Modules
52125211

52135212
#
@@ -5525,6 +5524,7 @@ CONFIG_PACKAGE_luci-proto-ipv6=y
55255524
# CONFIG_PACKAGE_luci-proto-nebula is not set
55265525
# CONFIG_PACKAGE_luci-proto-openconnect is not set
55275526
# CONFIG_PACKAGE_luci-proto-openfortivpn is not set
5527+
# CONFIG_PACKAGE_luci-proto-openvpnc is not set
55285528
CONFIG_PACKAGE_luci-proto-ppp=y
55295529
# CONFIG_PACKAGE_luci-proto-pppossh is not set
55305530
# CONFIG_PACKAGE_luci-proto-qmi is not set
@@ -7260,6 +7260,8 @@ CONFIG_PACKAGE_libipset=y
72607260
# CONFIG_PACKAGE_mbusd is not set
72617261
# CONFIG_PACKAGE_memcached is not set
72627262
# CONFIG_PACKAGE_mentohust is not set
7263+
# CONFIG_PACKAGE_mihomo-alpha is not set
7264+
CONFIG_PACKAGE_mihomo-meta=y
72637265
# CONFIG_PACKAGE_mii-tool is not set
72647266
# CONFIG_PACKAGE_mikrotik-btest is not set
72657267
# CONFIG_PACKAGE_mini_snmpd is not set

0 commit comments

Comments
 (0)