diff --git a/.config b/.config index 3ad54861ad..da65cdcf5f 100644 --- a/.config +++ b/.config @@ -69,10 +69,7 @@ CONFIG_TARGET_ramips_mt76x8=y # CONFIG_TARGET_ramips_mt76x8_DEVICE_comfast_cf-wr617ac is not set # CONFIG_TARGET_ramips_mt76x8_DEVICE_comfast_cf-wr758ac-v1 is not set # CONFIG_TARGET_ramips_mt76x8_DEVICE_comfast_cf-wr758ac-v2 is not set -<<<<<<< HEAD # CONFIG_TARGET_ramips_mt76x8_DEVICE_cudy_m1200-v1 is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_TARGET_ramips_mt76x8_DEVICE_cudy_tr1200-v1 is not set # CONFIG_TARGET_ramips_mt76x8_DEVICE_cudy_wr1000 is not set # CONFIG_TARGET_ramips_mt76x8_DEVICE_d-team_pbr-d1 is not set @@ -349,10 +346,7 @@ CONFIG_KERNEL_IPV6_PIMSM_V2=y # CONFIG_KERNEL_IPV6_SEG6_LWTUNNEL is not set # CONFIG_KERNEL_LWTUNNEL_BPF is not set # CONFIG_KERNEL_NET_L3_MASTER_DEV is not set -<<<<<<< HEAD # CONFIG_KERNEL_DCB is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_KERNEL_XDP_SOCKETS is not set CONFIG_KERNEL_PAGE_POOL=y # CONFIG_KERNEL_PAGE_POOL_STATS is not set @@ -465,10 +459,7 @@ CONFIG_EXTRA_GCC_CONFIG_OPTIONS="" CONFIG_MUSL_DISABLE_CRYPT_SIZE_HACK=y CONFIG_GDB=y # CONFIG_GDB_PYTHON is not set -<<<<<<< HEAD CONFIG_HAS_BPF_TOOLCHAIN=y -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_HAS_PREBUILT_LLVM_TOOLCHAIN is not set CONFIG_USE_MUSL=y CONFIG_SSP_SUPPORT=y @@ -500,11 +491,7 @@ CONFIG_TARGET_INIT_ENV="" CONFIG_TARGET_INIT_CMD="/sbin/init" CONFIG_TARGET_INIT_SUPPRESS_STDERR=y CONFIG_VERSIONOPT=y -<<<<<<< HEAD CONFIG_VERSION_DIST="OpenWrt-CGHMND-Node" -======= -CONFIG_VERSION_DIST="OpenWrt-CGHMND-GW" ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 CONFIG_VERSION_NUMBER="" CONFIG_VERSION_CODE="" CONFIG_VERSION_REPO="https://downloads.openwrt.org/snapshots" @@ -530,10 +517,7 @@ CONFIG_PACKAGE_base-files=y # CONFIG_PACKAGE_block-mount is not set # CONFIG_PACKAGE_blockd is not set # CONFIG_PACKAGE_bridge is not set -<<<<<<< HEAD # CONFIG_PACKAGE_bridger is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 CONFIG_PACKAGE_busybox=y CONFIG_BUSYBOX_CUSTOM=y CONFIG_BUSYBOX_DEFAULT_HAVE_DOT_CONFIG=y @@ -2595,10 +2579,7 @@ CONFIG_PACKAGE_procd=y CONFIG_PACKAGE_procd-seccomp=y # CONFIG_PACKAGE_procd-selinux is not set # CONFIG_PACKAGE_qos-scripts is not set -<<<<<<< HEAD # CONFIG_PACKAGE_qosify is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_refpolicy is not set CONFIG_PACKAGE_resolveip=y CONFIG_PACKAGE_rpcd=y @@ -2816,10 +2797,7 @@ CONFIG_PACKAGE_libiwinfo-data=y # CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct is not set # CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct-full-htt is not set # CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct-htt is not set -<<<<<<< HEAD # CONFIG_PACKAGE_ath11k-firmware-ipq5018 is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_ath11k-firmware-ipq6018 is not set # CONFIG_PACKAGE_ath11k-firmware-ipq8074 is not set # CONFIG_PACKAGE_ath11k-firmware-qca2066 is not set @@ -2891,10 +2869,7 @@ CONFIG_PACKAGE_libiwinfo-data=y # CONFIG_PACKAGE_i915-firmware-guc is not set # CONFIG_PACKAGE_i915-firmware-huc is not set # CONFIG_PACKAGE_ibt-firmware is not set -<<<<<<< HEAD # CONFIG_PACKAGE_ice-firmware is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_iwl3945-firmware is not set # CONFIG_PACKAGE_iwl4965-firmware is not set # CONFIG_PACKAGE_iwlwifi-firmware-ax101 is not set @@ -3066,7 +3041,6 @@ CONFIG_PACKAGE_wireless-regdb=y # end of Block Devices # -<<<<<<< HEAD # Bluetooth Support # # CONFIG_PACKAGE_kmod-ath3k is not set @@ -3079,8 +3053,6 @@ CONFIG_PACKAGE_wireless-regdb=y # end of Bluetooth Support # -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CAN Support # # CONFIG_PACKAGE_kmod-can is not set @@ -3526,12 +3498,9 @@ CONFIG_PACKAGE_kmod-nft-offload=y # CONFIG_PACKAGE_kmod-dsa-mv88e6060 is not set # CONFIG_PACKAGE_kmod-dsa-mv88e6xxx is not set # CONFIG_PACKAGE_kmod-dsa-qca8k is not set -<<<<<<< HEAD # CONFIG_PACKAGE_kmod-dsa-realtek is not set # CONFIG_PACKAGE_kmod-dsa-rtl8365mb is not set # CONFIG_PACKAGE_kmod-dsa-rtl8366rb is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 CONFIG_PACKAGE_kmod-dummy=y # CONFIG_PACKAGE_kmod-e100 is not set # CONFIG_PACKAGE_kmod-e1000 is not set @@ -3543,10 +3512,7 @@ CONFIG_PACKAGE_kmod-dummy=y # CONFIG_PACKAGE_kmod-hfcpci is not set # CONFIG_PACKAGE_kmod-i40e is not set # CONFIG_PACKAGE_kmod-iavf is not set -<<<<<<< HEAD # CONFIG_PACKAGE_kmod-ice is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_kmod-ifb is not set # CONFIG_PACKAGE_kmod-igb is not set # CONFIG_PACKAGE_kmod-igc is not set @@ -3639,7 +3605,6 @@ CONFIG_PACKAGE_kmod-dummy=y # CONFIG_PACKAGE_kmod-fou is not set # CONFIG_PACKAGE_kmod-fou6 is not set # CONFIG_PACKAGE_kmod-geneve is not set -<<<<<<< HEAD CONFIG_PACKAGE_kmod-gre=y CONFIG_PACKAGE_kmod-gre6=y # CONFIG_PACKAGE_kmod-inet-diag is not set @@ -3652,20 +3617,6 @@ CONFIG_PACKAGE_kmod-iptunnel6=y CONFIG_PACKAGE_kmod-l2tp=y CONFIG_PACKAGE_kmod-l2tp-eth=y CONFIG_PACKAGE_kmod-l2tp-ip=y -======= -# CONFIG_PACKAGE_kmod-gre is not set -# CONFIG_PACKAGE_kmod-gre6 is not set -# CONFIG_PACKAGE_kmod-inet-diag is not set -# CONFIG_PACKAGE_kmod-ip6-tunnel is not set -# CONFIG_PACKAGE_kmod-ipip is not set -# CONFIG_PACKAGE_kmod-ipsec is not set -CONFIG_PACKAGE_kmod-iptunnel=y -# CONFIG_PACKAGE_kmod-iptunnel6 is not set -# CONFIG_PACKAGE_kmod-jool-netfilter is not set -# CONFIG_PACKAGE_kmod-l2tp is not set -# CONFIG_PACKAGE_kmod-l2tp-eth is not set -# CONFIG_PACKAGE_kmod-l2tp-ip is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_kmod-macremapper is not set # CONFIG_PACKAGE_kmod-macsec is not set # CONFIG_PACKAGE_kmod-mdio-netlink is not set @@ -3689,11 +3640,7 @@ CONFIG_PACKAGE_kmod-ppp=y # CONFIG_PACKAGE_kmod-ppp-synctty is not set # CONFIG_PACKAGE_kmod-pppoa is not set CONFIG_PACKAGE_kmod-pppoe=y -<<<<<<< HEAD CONFIG_PACKAGE_kmod-pppol2tp=y -======= -# CONFIG_PACKAGE_kmod-pppol2tp is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 CONFIG_PACKAGE_kmod-pppox=y # CONFIG_PACKAGE_kmod-pptp is not set # CONFIG_PACKAGE_kmod-qrtr-mhi is not set @@ -3727,11 +3674,7 @@ CONFIG_PACKAGE_kmod-slhc=y # CONFIG_PACKAGE_kmod-tcp-scalable is not set # CONFIG_PACKAGE_kmod-tls is not set # CONFIG_PACKAGE_kmod-trelay is not set -<<<<<<< HEAD CONFIG_PACKAGE_kmod-tun=y -======= -# CONFIG_PACKAGE_kmod-tun is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 CONFIG_PACKAGE_kmod-udptunnel4=y CONFIG_PACKAGE_kmod-udptunnel6=y # CONFIG_PACKAGE_kmod-veth is not set @@ -3743,16 +3686,7 @@ CONFIG_PACKAGE_kmod-wireguard=y # Other modules # # CONFIG_PACKAGE_kmod-6lowpan is not set -<<<<<<< HEAD # CONFIG_PACKAGE_kmod-bcma is not set -======= -# CONFIG_PACKAGE_kmod-ath3k is not set -# CONFIG_PACKAGE_kmod-bcma is not set -# CONFIG_PACKAGE_kmod-bluetooth is not set -# CONFIG_PACKAGE_kmod-bluetooth-6lowpan is not set -# CONFIG_PACKAGE_kmod-btmrvl is not set -# CONFIG_PACKAGE_kmod-btsdio is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_kmod-button-hotplug is not set # CONFIG_PACKAGE_kmod-dma-ralink is not set # CONFIG_PACKAGE_kmod-echo is not set @@ -4134,19 +4068,12 @@ CONFIG_GOLANG_BUILD_CACHE_DIR="" # CONFIG_PACKAGE_lpeg is not set # CONFIG_PACKAGE_lsqlite3 is not set # CONFIG_PACKAGE_lsqlite3-lua5.3 is not set -<<<<<<< HEAD CONFIG_PACKAGE_lua=y -======= -# CONFIG_PACKAGE_lua is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_lua-argparse is not set # CONFIG_PACKAGE_lua-bencode is not set # CONFIG_PACKAGE_lua-bit32 is not set # CONFIG_PACKAGE_lua-cjson is not set -<<<<<<< HEAD # CONFIG_PACKAGE_lua-cjson-lua5.3 is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_lua-copas is not set # CONFIG_PACKAGE_lua-coxpcall is not set # CONFIG_PACKAGE_lua-cs-bouncer is not set @@ -4175,10 +4102,7 @@ CONFIG_LUA_ECO_MBEDTLS=y # CONFIG_PACKAGE_lua-eco-ubus is not set # CONFIG_PACKAGE_lua-eco-websocket is not set # CONFIG_PACKAGE_lua-ev is not set -<<<<<<< HEAD # CONFIG_PACKAGE_lua-examples is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_lua-ffi is not set # CONFIG_PACKAGE_lua-ffi-lua5.3 is not set # CONFIG_PACKAGE_lua-ffi-lua5.4 is not set @@ -4228,7 +4152,6 @@ CONFIG_HAS_LUAJIT_ARCH=y # # Node.js # -<<<<<<< HEAD # CONFIG_PACKAGE_node-arduino-firmata is not set # CONFIG_PACKAGE_node-cylon is not set # CONFIG_PACKAGE_node-cylon-firmata is not set @@ -4239,8 +4162,6 @@ CONFIG_HAS_LUAJIT_ARCH=y # CONFIG_PACKAGE_node-javascript-obfuscator is not set # CONFIG_PACKAGE_node-serialport is not set # CONFIG_PACKAGE_node-serialport-bindings is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # end of Node.js # @@ -4571,12 +4492,8 @@ CONFIG_PACKAGE_ucode-mod-uloop=y # Compression # # CONFIG_PACKAGE_libbz2 is not set -<<<<<<< HEAD CONFIG_PACKAGE_liblz4=y # CONFIG_LZ4_OPTIMIZE_SPEED is not set -======= -# CONFIG_PACKAGE_liblz4 is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_liblzma is not set # CONFIG_PACKAGE_libunrar is not set # CONFIG_PACKAGE_libzip-gnutls is not set @@ -5349,12 +5266,8 @@ CONFIG_PACKAGE_libblobmsg-json=y # CONFIG_PACKAGE_libbpf is not set # CONFIG_PACKAGE_libbsd is not set # CONFIG_PACKAGE_libcap is not set -<<<<<<< HEAD CONFIG_PACKAGE_libcap-ng=y # CONFIG_PACKAGE_libcap-ng-bin is not set -======= -# CONFIG_PACKAGE_libcap-ng is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_libcares is not set # CONFIG_PACKAGE_libcbor is not set # CONFIG_PACKAGE_libcgroup is not set @@ -5471,21 +5384,12 @@ CONFIG_PACKAGE_libjson-c=y # CONFIG_PACKAGE_libloragw is not set # CONFIG_PACKAGE_libltdl is not set # CONFIG_PACKAGE_liblto is not set -<<<<<<< HEAD CONFIG_PACKAGE_liblua=y # CONFIG_PACKAGE_liblua5.3 is not set # CONFIG_PACKAGE_liblua5.4 is not set CONFIG_PACKAGE_liblucihttp=y CONFIG_PACKAGE_liblucihttp-lua=y CONFIG_PACKAGE_liblucihttp-ucode=y -======= -# CONFIG_PACKAGE_liblua is not set -# CONFIG_PACKAGE_liblua5.3 is not set -# CONFIG_PACKAGE_liblua5.4 is not set -# CONFIG_PACKAGE_liblucihttp is not set -# CONFIG_PACKAGE_liblucihttp-lua is not set -# CONFIG_PACKAGE_liblucihttp-ucode is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_liblzo is not set # CONFIG_PACKAGE_libmad is not set # CONFIG_PACKAGE_libmagic is not set @@ -5647,11 +5551,7 @@ CONFIG_PACKAGE_libreadline=y CONFIG_PACKAGE_libubox=y # CONFIG_PACKAGE_libubox-lua is not set CONFIG_PACKAGE_libubus=y -<<<<<<< HEAD CONFIG_PACKAGE_libubus-lua=y -======= -# CONFIG_PACKAGE_libubus-lua is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 CONFIG_PACKAGE_libuci=y # CONFIG_PACKAGE_libuci-lua is not set # CONFIG_PACKAGE_libuci2 is not set @@ -5688,10 +5588,7 @@ CONFIG_PACKAGE_libustream-mbedtls=y # CONFIG_PACKAGE_libwebsockets-openssl is not set # CONFIG_PACKAGE_libwpe is not set # CONFIG_PACKAGE_libwrap is not set -<<<<<<< HEAD # CONFIG_PACKAGE_libxdp is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_libxerces-c is not set # CONFIG_PACKAGE_libxerces-c-samples is not set # CONFIG_PACKAGE_libxkbcommon is not set @@ -5715,10 +5612,6 @@ CONFIG_PACKAGE_libustream-mbedtls=y # CONFIG_PACKAGE_msgpack-c is not set # CONFIG_PACKAGE_mtdev is not set # CONFIG_PACKAGE_musl-fts is not set -<<<<<<< HEAD -======= -# CONFIG_PACKAGE_mxml is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_nspr is not set # CONFIG_PACKAGE_oath-pam is not set # CONFIG_PACKAGE_oniguruma is not set @@ -5732,15 +5625,9 @@ CONFIG_PACKAGE_libustream-mbedtls=y # CONFIG_PACKAGE_protobuf-lite is not set # CONFIG_PACKAGE_pthsem is not set # CONFIG_PACKAGE_re2 is not set -<<<<<<< HEAD CONFIG_PACKAGE_rpcd-mod-luci=y # CONFIG_PACKAGE_rpcd-mod-rad2-enc is not set CONFIG_PACKAGE_rpcd-mod-rrdns=y -======= -# CONFIG_PACKAGE_rpcd-mod-luci is not set -# CONFIG_PACKAGE_rpcd-mod-rad2-enc is not set -# CONFIG_PACKAGE_rpcd-mod-rrdns is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_rpcd-mod-wireguard is not set # CONFIG_PACKAGE_sbc is not set # CONFIG_PACKAGE_serdisplib is not set @@ -5778,13 +5665,8 @@ CONFIG_PACKAGE_zlib=y # # 1. Collections # -<<<<<<< HEAD CONFIG_PACKAGE_luci=y CONFIG_PACKAGE_luci-light=y -======= -# CONFIG_PACKAGE_luci is not set -# CONFIG_PACKAGE_luci-light is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-nginx is not set # CONFIG_PACKAGE_luci-ssl is not set # CONFIG_PACKAGE_luci-ssl-openssl is not set @@ -5793,11 +5675,7 @@ CONFIG_PACKAGE_luci-light=y # # 2. Modules # -<<<<<<< HEAD CONFIG_PACKAGE_luci-base=y -======= -# CONFIG_PACKAGE_luci-base is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_LUCI_SRCDIET is not set CONFIG_LUCI_JSMIN=y CONFIG_LUCI_CSSTIDY=y @@ -5844,7 +5722,6 @@ CONFIG_LUCI_CSSTIDY=y # CONFIG_LUCI_LANG_zh_Hant is not set # end of Translations -<<<<<<< HEAD CONFIG_PACKAGE_luci-compat=y CONFIG_PACKAGE_luci-lua-runtime=y CONFIG_PACKAGE_luci-mod-admin-full=y @@ -5855,18 +5732,6 @@ CONFIG_PACKAGE_luci-mod-network=y # CONFIG_PACKAGE_luci-mod-rpc is not set CONFIG_PACKAGE_luci-mod-status=y CONFIG_PACKAGE_luci-mod-system=y -======= -# CONFIG_PACKAGE_luci-compat is not set -# CONFIG_PACKAGE_luci-lua-runtime is not set -# CONFIG_PACKAGE_luci-mod-admin-full is not set -# CONFIG_PACKAGE_luci-mod-battstatus is not set -# CONFIG_PACKAGE_luci-mod-dashboard is not set -# CONFIG_PACKAGE_luci-mod-dsl is not set -# CONFIG_PACKAGE_luci-mod-network is not set -# CONFIG_PACKAGE_luci-mod-rpc is not set -# CONFIG_PACKAGE_luci-mod-status is not set -# CONFIG_PACKAGE_luci-mod-system is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # end of 2. Modules # @@ -5878,10 +5743,7 @@ CONFIG_PACKAGE_luci-mod-system=y # CONFIG_PACKAGE_luci-app-adblock-fast is not set # CONFIG_PACKAGE_luci-app-advanced-reboot is not set # CONFIG_PACKAGE_luci-app-alist is not set -<<<<<<< HEAD # CONFIG_PACKAGE_luci-app-antiblock is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-app-apinger is not set # CONFIG_PACKAGE_luci-app-aria2 is not set # CONFIG_PACKAGE_luci-app-attendedsysupgrade is not set @@ -5906,11 +5768,7 @@ CONFIG_PACKAGE_luci-mod-system=y # CONFIG_PACKAGE_luci-app-example is not set # CONFIG_PACKAGE_luci-app-filebrowser is not set # CONFIG_PACKAGE_luci-app-filemanager is not set -<<<<<<< HEAD CONFIG_PACKAGE_luci-app-firewall=y -======= -# CONFIG_PACKAGE_luci-app-firewall is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-app-frpc is not set # CONFIG_PACKAGE_luci-app-frps is not set # CONFIG_PACKAGE_luci-app-fwknopd is not set @@ -5918,10 +5776,7 @@ CONFIG_PACKAGE_luci-app-firewall=y # CONFIG_PACKAGE_luci-app-hnet is not set # CONFIG_PACKAGE_luci-app-https-dns-proxy is not set # CONFIG_PACKAGE_luci-app-irqbalance is not set -<<<<<<< HEAD # CONFIG_PACKAGE_luci-app-keepalived is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-app-ksmbd is not set # CONFIG_PACKAGE_luci-app-ledtrig-rssi is not set # CONFIG_PACKAGE_luci-app-ledtrig-switch is not set @@ -5949,11 +5804,7 @@ CONFIG_PACKAGE_luci-app-firewall=y # CONFIG_PACKAGE_luci-app-openvpn is not set # CONFIG_PACKAGE_luci-app-openwisp is not set # CONFIG_PACKAGE_luci-app-p910nd is not set -<<<<<<< HEAD CONFIG_PACKAGE_luci-app-package-manager=y -======= -# CONFIG_PACKAGE_luci-app-package-manager is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-app-pagekitec is not set # CONFIG_PACKAGE_luci-app-pbr is not set # CONFIG_PACKAGE_luci-app-privoxy is not set @@ -5994,11 +5845,7 @@ CONFIG_PACKAGE_luci-app-package-manager=y # # 4. Themes # -<<<<<<< HEAD CONFIG_PACKAGE_luci-theme-bootstrap=y -======= -# CONFIG_PACKAGE_luci-theme-bootstrap is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-theme-material is not set # CONFIG_PACKAGE_luci-theme-openwrt is not set # CONFIG_PACKAGE_luci-theme-openwrt-2020 is not set @@ -6011,48 +5858,31 @@ CONFIG_PACKAGE_luci-theme-bootstrap=y # CONFIG_PACKAGE_luci-proto-autoip is not set # CONFIG_PACKAGE_luci-proto-batman-adv is not set # CONFIG_PACKAGE_luci-proto-external is not set -<<<<<<< HEAD CONFIG_PACKAGE_luci-proto-gre=y # CONFIG_PACKAGE_luci-proto-hnet is not set # CONFIG_PACKAGE_luci-proto-ipip is not set CONFIG_PACKAGE_luci-proto-ipv6=y -======= -# CONFIG_PACKAGE_luci-proto-gre is not set -# CONFIG_PACKAGE_luci-proto-hnet is not set -# CONFIG_PACKAGE_luci-proto-ipip is not set -# CONFIG_PACKAGE_luci-proto-ipv6 is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-proto-mbim is not set # CONFIG_PACKAGE_luci-proto-modemmanager is not set # CONFIG_PACKAGE_luci-proto-ncm is not set # CONFIG_PACKAGE_luci-proto-nebula is not set # CONFIG_PACKAGE_luci-proto-openconnect is not set # CONFIG_PACKAGE_luci-proto-openfortivpn is not set -<<<<<<< HEAD CONFIG_PACKAGE_luci-proto-ppp=y -======= -# CONFIG_PACKAGE_luci-proto-ppp is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-proto-pppossh is not set # CONFIG_PACKAGE_luci-proto-qmi is not set # CONFIG_PACKAGE_luci-proto-relay is not set # CONFIG_PACKAGE_luci-proto-sstp is not set # CONFIG_PACKAGE_luci-proto-unet is not set # CONFIG_PACKAGE_luci-proto-vpnc is not set -<<<<<<< HEAD CONFIG_PACKAGE_luci-proto-vxlan=y CONFIG_PACKAGE_luci-proto-wireguard=y -======= -# CONFIG_PACKAGE_luci-proto-vxlan is not set -# CONFIG_PACKAGE_luci-proto-wireguard is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_luci-proto-yggdrasil is not set # end of 5. Protocols # # 6. Libraries # -<<<<<<< HEAD CONFIG_PACKAGE_luci-lib-base=y # CONFIG_PACKAGE_luci-lib-chartjs is not set # CONFIG_PACKAGE_luci-lib-httpclient is not set @@ -6176,21 +6006,6 @@ CONFIG_PACKAGE_luci-lib-uqr=y # CONFIG_PACKAGE_luci-i18n-package-manager-yua is not set # CONFIG_PACKAGE_luci-i18n-package-manager-zh-cn is not set # CONFIG_PACKAGE_luci-i18n-package-manager-zh-tw is not set -======= -# CONFIG_PACKAGE_luci-lib-base is not set -# CONFIG_PACKAGE_luci-lib-chartjs is not set -# CONFIG_PACKAGE_luci-lib-httpclient is not set -# CONFIG_PACKAGE_luci-lib-httpprotoutils is not set -# CONFIG_PACKAGE_luci-lib-ip is not set -# CONFIG_PACKAGE_luci-lib-ipkg is not set -# CONFIG_PACKAGE_luci-lib-iptparser is not set -# CONFIG_PACKAGE_luci-lib-json is not set -# CONFIG_PACKAGE_luci-lib-jsonc is not set -# CONFIG_PACKAGE_luci-lib-nixio is not set -# CONFIG_PACKAGE_luci-lib-px5g is not set -# CONFIG_PACKAGE_luci-lib-uqr is not set -# end of 6. Libraries ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # end of LuCI # @@ -6352,11 +6167,8 @@ CONFIG_PACKAGE_luci-lib-uqr=y # CONFIG_PACKAGE_ksmbd-hotplug is not set # CONFIG_PACKAGE_ksmbd-server is not set # CONFIG_PACKAGE_netatalk is not set -<<<<<<< HEAD # CONFIG_PACKAGE_netatalk-full is not set # CONFIG_PACKAGE_netatalk-small is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_nfs-kernel-server is not set # CONFIG_PACKAGE_owftpd is not set # CONFIG_PACKAGE_owhttpd is not set @@ -6859,7 +6671,6 @@ CONFIG_PACKAGE_ip-tiny=y # CONFIG_PACKAGE_openconnect is not set # CONFIG_PACKAGE_openfortivpn is not set # CONFIG_PACKAGE_openvpn-easy-rsa is not set -<<<<<<< HEAD CONFIG_PACKAGE_openvpn-mbedtls=y # CONFIG_OPENVPN_mbedtls_ENABLE_LZO is not set CONFIG_OPENVPN_mbedtls_ENABLE_LZ4=y @@ -6869,9 +6680,6 @@ CONFIG_OPENVPN_mbedtls_ENABLE_PORT_SHARE=y # CONFIG_OPENVPN_mbedtls_ENABLE_IPROUTE2 is not set # CONFIG_OPENVPN_mbedtls_ENABLE_DCO is not set CONFIG_OPENVPN_mbedtls_ENABLE_SMALL=y -======= -# CONFIG_PACKAGE_openvpn-mbedtls is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_openvpn-openssl is not set # CONFIG_PACKAGE_openvpn-wolfssl is not set # CONFIG_PACKAGE_pptpd is not set @@ -6895,11 +6703,7 @@ CONFIG_OPENVPN_mbedtls_ENABLE_SMALL=y # CONFIG_PACKAGE_wgsd-client is not set # CONFIG_PACKAGE_wgsd-coredns is not set CONFIG_PACKAGE_wireguard-tools=y -<<<<<<< HEAD CONFIG_PACKAGE_xl2tpd=y -======= -# CONFIG_PACKAGE_xl2tpd is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_zerotier is not set # end of VPN @@ -6929,11 +6733,7 @@ CONFIG_PACKAGE_xl2tpd=y # Web Servers/Proxies # # CONFIG_PACKAGE_apache is not set -<<<<<<< HEAD CONFIG_PACKAGE_cgi-io=y -======= -# CONFIG_PACKAGE_cgi-io is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_clamav is not set # CONFIG_PACKAGE_cloudflared is not set # CONFIG_PACKAGE_etebase is not set @@ -7045,17 +6845,10 @@ CONFIG_WPA_MBO_SUPPORT=y # CONFIG_PACKAGE_wpa-supplicant-wolfssl is not set # CONFIG_PACKAGE_wpad is not set # CONFIG_PACKAGE_wpad-basic is not set -<<<<<<< HEAD # CONFIG_PACKAGE_wpad-basic-mbedtls is not set # CONFIG_PACKAGE_wpad-basic-openssl is not set # CONFIG_PACKAGE_wpad-basic-wolfssl is not set CONFIG_PACKAGE_wpad-mbedtls=y -======= -CONFIG_PACKAGE_wpad-basic-mbedtls=y -# CONFIG_PACKAGE_wpad-basic-openssl is not set -# CONFIG_PACKAGE_wpad-basic-wolfssl is not set -# CONFIG_PACKAGE_wpad-mbedtls is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_wpad-mesh-mbedtls is not set # CONFIG_PACKAGE_wpad-mesh-openssl is not set # CONFIG_PACKAGE_wpad-mesh-wolfssl is not set @@ -7116,10 +6909,7 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=y # CONFIG_PACKAGE_cni-route-override is not set # CONFIG_PACKAGE_coap-server is not set # CONFIG_PACKAGE_conserver is not set -<<<<<<< HEAD # CONFIG_PACKAGE_conserver-ipmi is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_crowdsec is not set # CONFIG_PACKAGE_crowdsec-firewall-bouncer is not set # CONFIG_PACKAGE_cshark is not set @@ -7136,7 +6926,6 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=y # CONFIG_PACKAGE_ethtool is not set # CONFIG_PACKAGE_ethtool-full is not set # CONFIG_PACKAGE_evilginx2 is not set -<<<<<<< HEAD CONFIG_PACKAGE_external-protocol=y # CONFIG_PACKAGE_fail2ban is not set # CONFIG_PACKAGE_fakeidentd is not set @@ -7145,14 +6934,6 @@ CONFIG_PACKAGE_external-protocol=y # CONFIG_PACKAGE_foolsm is not set # CONFIG_PACKAGE_fping is not set # CONFIG_PACKAGE_freeipmi-tools is not set -======= -# CONFIG_PACKAGE_external-protocol is not set -# CONFIG_PACKAGE_fail2ban is not set -# CONFIG_PACKAGE_fakeidentd is not set -# CONFIG_PACKAGE_fakepop is not set -# CONFIG_PACKAGE_foolsm is not set -# CONFIG_PACKAGE_fping is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_fsh is not set # CONFIG_PACKAGE_generate-ipv6-address is not set # CONFIG_PACKAGE_gensio-bin is not set @@ -7161,11 +6942,7 @@ CONFIG_PACKAGE_external-protocol=y # CONFIG_PACKAGE_geoipupdate is not set # CONFIG_PACKAGE_gnunet is not set # CONFIG_PACKAGE_gping is not set -<<<<<<< HEAD CONFIG_PACKAGE_gre=y -======= -# CONFIG_PACKAGE_gre is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_gsocket is not set # CONFIG_PACKAGE_hev-socks5-server is not set # CONFIG_PACKAGE_hev-socks5-tproxy is not set @@ -7203,22 +6980,16 @@ CONFIG_PACKAGE_iw=y # CONFIG_PACKAGE_iw-full is not set # CONFIG_PACKAGE_jool-tools-netfilter is not set # CONFIG_PACKAGE_keepalived is not set -<<<<<<< HEAD # CONFIG_PACKAGE_keepalived-sync is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_knxd is not set # CONFIG_PACKAGE_kplex is not set # CONFIG_PACKAGE_krb5-client is not set # CONFIG_PACKAGE_krb5-libs is not set # CONFIG_PACKAGE_krb5-server is not set # CONFIG_PACKAGE_krb5-server-extras is not set -<<<<<<< HEAD # CONFIG_PACKAGE_libfreeipmi is not set # CONFIG_PACKAGE_libipmiconsole is not set # CONFIG_PACKAGE_libipmidetect is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_libipset is not set # CONFIG_PACKAGE_libndp is not set # CONFIG_PACKAGE_linknx is not set @@ -7291,10 +7062,7 @@ CONFIG_PACKAGE_odhcpd_ipv6only_ext_cer_id=0 # CONFIG_PACKAGE_pcapplusplus is not set # CONFIG_PACKAGE_pen is not set # CONFIG_PACKAGE_phantap is not set -<<<<<<< HEAD # CONFIG_PACKAGE_phytool is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_pimbd is not set # CONFIG_PACKAGE_pingcheck is not set # CONFIG_PACKAGE_port-mirroring is not set @@ -7302,11 +7070,7 @@ CONFIG_PACKAGE_ppp=y # CONFIG_PACKAGE_ppp-mod-passwordfd is not set # CONFIG_PACKAGE_ppp-mod-pppoa is not set CONFIG_PACKAGE_ppp-mod-pppoe=y -<<<<<<< HEAD CONFIG_PACKAGE_ppp-mod-pppol2tp=y -======= -# CONFIG_PACKAGE_ppp-mod-pppol2tp is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_ppp-mod-pptp is not set # CONFIG_PACKAGE_ppp-mod-radius is not set # CONFIG_PACKAGE_ppp-multilink is not set @@ -7399,7 +7163,6 @@ CONFIG_PACKAGE_uclient-fetch=y CONFIG_PACKAGE_vxlan=y # CONFIG_PACKAGE_wakeonlan is not set # CONFIG_PACKAGE_wg-installer-client is not set -<<<<<<< HEAD # CONFIG_PACKAGE_wg-installer-server is not set # CONFIG_PACKAGE_wifi-presence is not set # CONFIG_PACKAGE_wpan-tools is not set @@ -7407,11 +7170,6 @@ CONFIG_PACKAGE_vxlan=y # CONFIG_PACKAGE_xdp-filter is not set # CONFIG_PACKAGE_xdp-loader is not set # CONFIG_PACKAGE_xdpdump is not set -======= -# CONFIG_PACKAGE_wifi-presence is not set -# CONFIG_PACKAGE_wpan-tools is not set -# CONFIG_PACKAGE_wwan is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_xinetd is not set # CONFIG_PACKAGE_xray-core is not set # CONFIG_PACKAGE_ztdns is not set @@ -7560,11 +7318,7 @@ CONFIG_PACKAGE_vxlan=y # CONFIG_PACKAGE_joe-extras is not set # CONFIG_PACKAGE_jupp is not set # CONFIG_PACKAGE_mg is not set -<<<<<<< HEAD CONFIG_PACKAGE_nano=y -======= -# CONFIG_PACKAGE_nano is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_nano-full is not set # CONFIG_PACKAGE_nano-plus is not set # CONFIG_PACKAGE_vim is not set @@ -7853,10 +7607,7 @@ CONFIG_PACKAGE_nano=y # CONFIG_PACKAGE_checksec is not set # CONFIG_PACKAGE_checksec_automator is not set # CONFIG_PACKAGE_chkcon is not set -<<<<<<< HEAD # CONFIG_PACKAGE_cli is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_clocate is not set # CONFIG_PACKAGE_cmdpad is not set # CONFIG_PACKAGE_cni is not set @@ -7869,7 +7620,6 @@ CONFIG_PACKAGE_nano=y # CONFIG_PACKAGE_containerd is not set # CONFIG_PACKAGE_coremark is not set # CONFIG_PACKAGE_coreutils is not set -<<<<<<< HEAD # CONFIG_PACKAGE_coreutils-b2sum is not set # CONFIG_PACKAGE_coreutils-base32 is not set # CONFIG_PACKAGE_coreutils-base64 is not set @@ -7975,8 +7725,6 @@ CONFIG_PACKAGE_nano=y # CONFIG_PACKAGE_coreutils-who is not set # CONFIG_PACKAGE_coreutils-whoami is not set # CONFIG_PACKAGE_coreutils-yes is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_cpupower is not set # CONFIG_PACKAGE_cpusage is not set # CONFIG_PACKAGE_crconf is not set @@ -8017,10 +7765,7 @@ CONFIG_PACKAGE_nano=y # CONFIG_PACKAGE_flashrom-pci is not set # CONFIG_PACKAGE_flashrom-spi is not set # CONFIG_PACKAGE_flashrom-usb is not set -<<<<<<< HEAD # CONFIG_PACKAGE_flent-tools is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_flock is not set # CONFIG_PACKAGE_fritz-caldata is not set # CONFIG_PACKAGE_fritz-tffs is not set @@ -8169,10 +7914,7 @@ CONFIG_PACKAGE_libjson-script=y # CONFIG_PACKAGE_prometheus-node-exporter-lua is not set # CONFIG_PACKAGE_prometheus-node-exporter-ucode is not set # CONFIG_PACKAGE_prometheus-statsd-exporter is not set -<<<<<<< HEAD # CONFIG_PACKAGE_provision is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_pservice is not set # CONFIG_PACKAGE_psmisc is not set # CONFIG_PACKAGE_pv is not set @@ -8266,20 +8008,12 @@ CONFIG_STRACE_NONE=y # CONFIG_PACKAGE_triggerhappy is not set # CONFIG_PACKAGE_ubnt-manager is not set # CONFIG_PACKAGE_ucode-mod-bpf is not set -<<<<<<< HEAD CONFIG_PACKAGE_ucode-mod-html=y CONFIG_PACKAGE_ucode-mod-lua=y # CONFIG_PACKAGE_ucode-mod-pkgen is not set # CONFIG_PACKAGE_ucode-mod-uclient is not set # CONFIG_PACKAGE_ucode-mod-udebug is not set # CONFIG_PACKAGE_ucode-mod-uline is not set -======= -# CONFIG_PACKAGE_ucode-mod-html is not set -# CONFIG_PACKAGE_ucode-mod-lua is not set -# CONFIG_PACKAGE_ucode-mod-pkgen is not set -# CONFIG_PACKAGE_ucode-mod-uclient is not set -# CONFIG_PACKAGE_ucode-mod-udebug is not set ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_udebug-cli is not set # CONFIG_PACKAGE_udebugd is not set # CONFIG_PACKAGE_udns-dnsget is not set @@ -8288,10 +8022,7 @@ CONFIG_PACKAGE_ucode-mod-lua=y # CONFIG_PACKAGE_ugps is not set # CONFIG_PACKAGE_uhubctl is not set # CONFIG_PACKAGE_uledd is not set -<<<<<<< HEAD # CONFIG_PACKAGE_unetmsg is not set -======= ->>>>>>> 4e229539bd8dd125ea7ea32229a4950ec5d8e905 # CONFIG_PACKAGE_unix2dos is not set # CONFIG_PACKAGE_unshare is not set # CONFIG_PACKAGE_usb-modeswitch is not set diff --git a/target/linux/ramips/base-files/etc/uci-defaults/99_cghmn b/target/linux/ramips/base-files/etc/uci-defaults/99_cghmn deleted file mode 100644 index 70be7212db..0000000000 --- a/target/linux/ramips/base-files/etc/uci-defaults/99_cghmn +++ /dev/null @@ -1,193 +0,0 @@ -#!/bin/sh -# Set router defaults runing first boot - -# Ensure this script is only run once -if CONFIGED=$(uci get system.@system[0].cghmn_is_configured 2>/dev/null) && [ "$CONFIGED" = "1" ]; then - exit 0 -fi - -# Get last four letters of eth0 MAC -FULL_MAC=$(ip link show eth0 | awk '/link\/ether/ { gsub(":",""); print substr($2,0,4) ":" substr($2,5,4) ":" substr($2,9,4) }') -MAC_LASTFOUR=$(echo "${FULL_MAC}" | awk -F':' '{ print $3 }') -NEW_HOSTNAME="CGHMN-Node-$MAC_LASTFOUR" - -# Turn last four letters of MAC into IPv4 address suffix -LOCAL_IP4_FROM_MAC=$(printf "%d.%d" $(echo "${MAC_LASTFOUR}" | awk '{ print "0x" substr($0,0,2) " 0x" substr($0,3,2) }')) - -# Static variables used to configure the Wireguard tunnel -WG_PEER_ADDRESS="insert.target.server.domain" -WG_PEER_PUBKEY="VAVFX88DKGoO2naiWml1jepF7MVrIjDAbMhhYq5S1nQ=" - -# Wireguard IPv4 variables -WG_TUNNEL_INNER_SUBNET4="10.234." -WG_TUNNEL_INNER_SUBNET4_SIZE="16" -WG_TUNNEL_INNER_LOCAL_IP4="${WG_TUNNEL_INNER_SUBNET4}${LOCAL_IP4_FROM_MAC}" -WG_TUNNEL_INNER_PEER_IP4="${WG_TUNNEL_INNER_SUBNET4}.0.1" -WG_TUNNEL_REMOTE_SUBNET4="10.201.0.0/23" - -# Wireguard IPv6 variables -WG_TUNNEL_INNER_SUBNET6="fd38:f85d:a2fd::" -WG_TUNNEL_INNER_SUBNET6_SIZE="64" -WG_TUNNEL_INNER_LOCAL_IP6="${WG_TUNNEL_INNER_SUBNET6}${FULL_MAC}" -WG_TUNNEL_INNER_PEER_IP6="${WG_TUNNEL_INNER_SUBNET6}ffff:ffff:ffff:ffff" -WG_TUNNEL_REMOTE_SUBNET6="2001:470:5168:201::/64" - -# Generate new Wireguard private key for this node -WG_PRIVKEY="$(wg genkey)" - -# Static variables used to configure the VXLAN interface -VXLAN_LOCAL_IP="${WG_TUNNEL_INNER_LOCAL_IP6}" -VXLAN_PEER_IP="${WG_TUNNEL_INNER_PEER_IP6}" -VXLAN_ID="101" - -# Before adding new config, clear old firewall zones and rules -while uci -q delete firewall.@rule[0]; do :; done -while uci -q delete firewall.@zone[0]; do :; done -while uci -q delete firewall.@forwarding[0]; do :; done - -# Batch-add most UCI configuration next -uci -q batch <