1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00

Merge pull request #144 from Ysurac/develop

sync
This commit is contained in:
suyuan 2021-06-03 22:57:50 +08:00 committed by GitHub
commit ebd94ab758
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 822 additions and 419 deletions

View file

@ -1,3 +1,3 @@
#!/bin/sh
# Needed for some device, like rtl8156 2.5G USB adapter
[ "$ACTION" = "ifup" ] && [ -n "$DEVICE" ] && ethtool -s $DEVICE autoneg on
[ "$ACTION" = "ifup" ] && [ -n "$DEVICE" ] && [ -n "$(lsusb | grep 8156)" ] && ethtool -s $DEVICE autoneg on

View file

@ -564,7 +564,6 @@ _get_gre_tunnel() {
set shadowsocks-libev.oip${i}server=server
set shadowsocks-libev.oip${i}server.label="Server with public IP $publicaddr"
set shadowsocks-libev.oip${i}server.server_port="$ssport"
set shadowsocks-libev.oip${i}server.disabled="1"
set shadowsocks-libev.oip${i}server.server="$(uci -q get shadowsocks-libev.sss0.server)"
set shadowsocks-libev.oip${i}server.method="$(uci -q get shadowsocks-libev.sss0.method)"
set shadowsocks-libev.oip${i}server.key="$(uci -q get shadowsocks-libev.sss0.key)"
@ -589,6 +588,9 @@ _get_gre_tunnel() {
set shadowsocks-libev.oip${i}_rule.local_default='bypass'
set shadowsocks-libev.oip${i}_rule.redir_tcp="oip${i}"
EOF
if [ "$(uci -q get shadowsocks-libev.oip${i}server.disabled)" = "" ]; then
uci -q set shadowsocks-libev.oip${i}server.disabled="1"
fi
fi
i=$((i+1))
done

View file

@ -2,18 +2,18 @@
source /etc/os-release
if [ "$ID" = "openmptcprouter" ]; then
cat > "/etc/opkg/customfeeds.conf" <<-EOF
src/gz openwrt_luci http://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/luci
src/gz openwrt_packages http://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/packages
src/gz openwrt_base http://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/base
src/gz openwrt_routing http://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/routing
src/gz openwrt_telephony http://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/telephony
src/gz openwrt_luci https://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/luci
src/gz openwrt_packages https://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/packages
src/gz openwrt_base https://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/base
src/gz openwrt_routing https://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/routing
src/gz openwrt_telephony https://packages.openmptcprouter.com/${VERSION_ID}/${OPENWRT_ARCH}/telephony
EOF
TARGET="$(cat /etc/banner | awk '/TARGET/ {print $2}')"
cat > "/etc/opkg/distfeeds.conf" <<-EOF
src/gz openmptcprouter_core http://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/targets/${OPENWRT_BOARD}/packages
src/gz openmptcprouter_base http://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/packages/${OPENWRT_ARCH}/base
src/gz openmptcprouter_luci http://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/packages/${OPENWRT_ARCH}/luci
src/gz openmptcprouter_openmptcprouter http://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/packages/${OPENWRT_ARCH}/openmptcprouter
src/gz openmptcprouter_packages http://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/packages/${OPENWRT_ARCH}/packages
src/gz openmptcprouter_core https://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/targets/${OPENWRT_BOARD}/packages
src/gz openmptcprouter_base https://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/packages/${OPENWRT_ARCH}/base
src/gz openmptcprouter_luci https://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/packages/${OPENWRT_ARCH}/luci
src/gz openmptcprouter_openmptcprouter https://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/packages/${OPENWRT_ARCH}/openmptcprouter
src/gz openmptcprouter_packages https://download.openmptcprouter.com/release/${VERSION_ID}/${TARGET}/packages/${OPENWRT_ARCH}/packages
EOF
fi